Commit: 3e7f2b926aee5e75b33ae66fe098aad82a2ca099
Parent: 2f876e2808ea29722f60d51a33e1f97213c95c2e
Author: opask
Date: Tue, 11 Sep 2018 08:24:19 -0600
remove unused ftp options
Diffstat:
| M | default.c | | | 9 | +-------- |
| M | links.1 | | | 29 | +---------------------------- |
| M | links.h | | | 11 | ----------- |
| M | menu.c | | | 103 | +------------------------------------------------------------------------------ |
| M | sched.c | | | 2 | -- |
5 files changed, 3 insertions(+), 151 deletions(-)
diff --git a/default.c b/default.c
@@ -1011,12 +1011,11 @@ int font_cache_size = 2097152;
int aggressive_cache = 1;
struct ipv6_options ipv6_options = { ADDR_PREFERENCE_DEFAULT };
-struct proxies proxies = { "", "", "", "", "", "", 0 };
+struct proxies proxies = { "", "", "", "", "", 0 };
struct ssl_options ssl_options = { SSL_WARN_ON_INVALID_CERTIFICATE,
0,
"", "", "" };
struct http_options http_options = { 0, 1, 1, 0, 0, 0, 0, { 0, "", "" } };
-struct ftp_options ftp_options = { "somebody@host.domain", 0, 0, 0, 1 };
unsigned char download_dir[MAX_STR_LEN] = "";
@@ -1110,7 +1109,6 @@ static struct option links_options[] = {
{1, gen_cmd, num_rd, num_wr, 0, 1, &aggressive_cache, "http_bugs.aggressive_cache", "aggressive-cache"},
{1, gen_cmd, num_rd, num_wr, 0, 4, &ipv6_options.addr_preference, "ipv6.address_preference", "address-preference"},
{1, proxy_cmd, str_rd, str_wr, 0, MAX_STR_LEN, proxies.http_proxy, "http_proxy", "http-proxy"},
- {1, proxy_cmd, str_rd, str_wr, 0, MAX_STR_LEN, proxies.ftp_proxy, "ftp_proxy", "ftp-proxy"},
{1, proxy_cmd, str_rd, str_wr, 0, MAX_STR_LEN, proxies.https_proxy, "https_proxy", "https-proxy"},
{1, proxy_cmd, str_rd, str_wr, 0, MAX_STR_LEN, proxies.socks_proxy, "socks_proxy", "socks-proxy"},
{1, gen_cmd, str_rd, NULL, 0, MAX_STR_LEN, proxies.dns_append, "-append_text_to_dns_lookups", NULL}, /* old version incorrectly saved it with '-' */
@@ -1134,11 +1132,6 @@ static struct option links_options[] = {
{1, gen_cmd, num_rd, num_wr, 0, 1, &http_options.header.fake_firefox, "fake_firefox", "http.fake-firefox"},
{1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, &http_options.header.fake_useragent, "fake_useragent", "http.fake-user-agent"},
{1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, &http_options.header.extra_header, "http.extra_header", "http.extra-header"},
- {1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, ftp_options.anon_pass, "ftp.anonymous_password", "ftp.anonymous-password"},
- {1, gen_cmd, num_rd, num_wr, 0, 1, &ftp_options.passive_ftp, "ftp.use_passive", "ftp.use-passive"},
- {1, gen_cmd, num_rd, num_wr, 0, 1, &ftp_options.eprt_epsv, "ftp.use_eprt_epsv", "ftp.use-eprt-epsv"},
- {1, gen_cmd, num_rd, num_wr, 0, 1, &ftp_options.fast_ftp, "ftp.fast", "ftp.fast"},
- {1, gen_cmd, num_rd, num_wr, 0, 1, &ftp_options.set_tos, "ftp.set_iptos", "ftp.set-iptos"},
{1, gen_cmd, num_rd, num_wr, 1, MAX_FONT_SIZE, &menu_font_size, "menu_font_size", "menu-font-size"},
{1, gen_cmd, num_rd, num_wr, 0, 0xffffff, &G_BFU_BG_COLOR, "background_color", "menu-background-color"},
{1, gen_cmd, num_rd, num_wr, 0, 0xffffff, &G_BFU_FG_COLOR, "foreground_color", "menu-foreground-color"},
diff --git a/links.1 b/links.1
@@ -15,7 +15,7 @@ associated with external viewers. mailto: and telnet:
are supported via external clients.
.P
.I links
-can handle local (file://) or remote (http:// or ftp://) URLs.
+can handle local (file://) or remote (http://) URLs.
.PP
.SH OPTIONS
@@ -186,11 +186,6 @@ Host and port number of the HTTP proxy, or blank.
(default: blank)
.TP
-\f3-ftp-proxy \f2<host:port>\f1
-Host and port number of the FTP proxy, or blank.
-(default: blank)
-
-.TP
\f3-https-proxy \f2<host:port>\f1
Host and port number of the HTTPS proxy, or blank.
(default: blank)
@@ -298,28 +293,6 @@ Fake user agent value.
Extra string added to HTTP header.
.TP
-\f3-ftp.anonymous-password \f2<string>\f1
-Password for anonymous ftp access.
-
-.TP
-\f3-ftp.use-passive \f2<0>/<1>\f1
-Use ftp PASV command to bypass firewalls.
-
-.TP
-\f3-ftp.use-erpt-epsv \f2<0>/<1>\f1
-Use EPRT and EPSV commands instead of PORT and PASV.
-
-.TP
-\f3-ftp.fast \f2<0>/<1>\f1
-Send more ftp commands simultaneously. Faster response when
-browsing ftp directories, but it is incompatible with RFC
-and some servers don't like it.
-
-.TP
-\f3-ftp.set-iptos \f2<0>/<1>\f1
-Set IP Type-of-service to high throughput on ftp connections.
-
-.TP
\f3-menu-font-size \f2<size>\f1
Size of font in menu.
diff --git a/links.h b/links.h
@@ -3472,7 +3472,6 @@ extern struct ipv6_options ipv6_options;
struct proxies {
unsigned char http_proxy[MAX_STR_LEN];
- unsigned char ftp_proxy[MAX_STR_LEN];
unsigned char https_proxy[MAX_STR_LEN];
unsigned char socks_proxy[MAX_STR_LEN];
unsigned char dns_append[MAX_STR_LEN];
@@ -3515,16 +3514,6 @@ struct http_options {
extern struct http_options http_options;
-struct ftp_options {
- unsigned char anon_pass[MAX_STR_LEN];
- int passive_ftp;
- int eprt_epsv;
- int fast_ftp;
- int set_tos;
-};
-
-extern struct ftp_options ftp_options;
-
extern unsigned char download_dir[];
#define SCRUB_HEADERS (proxies.only_proxies || http_options.header.fake_firefox)
diff --git a/menu.c b/menu.c
@@ -978,7 +978,6 @@ static void dlg_ipv6_options(struct terminal *term, void *xxx, void *yyy)
static unsigned char * const proxy_msg[] = {
TEXT_(T_HTTP_PROXY__HOST_PORT),
- TEXT_(T_FTP_PROXY__HOST_PORT),
TEXT_(T_HTTPS_PROXY__HOST_PORT),
TEXT_(T_SOCKS_4A_PROXY__USER_HOST_PORT),
TEXT_(T_APPEND_TEXT_TO_SOCKS_LOOKUPS),
@@ -1052,9 +1051,6 @@ void reset_settings_for_tor(void)
http_options.retry_internal_errors = 0;
http_options.header.extra_header[0] = 0;
- ftp_options.eprt_epsv = 0;
- ftp_options.fast_ftp = 0;
-
dither_letters = 1;
dither_images = 1;
@@ -1086,7 +1082,6 @@ static void data_cleanup(void)
}
static unsigned char http_proxy[MAX_STR_LEN];
-static unsigned char ftp_proxy[MAX_STR_LEN];
static unsigned char https_proxy[MAX_STR_LEN];
static unsigned char socks_proxy[MAX_STR_LEN];
static unsigned char no_proxy[MAX_STR_LEN];
@@ -1225,7 +1220,6 @@ static int proxy_ok_dialog(struct dialog_data *dlg, struct dialog_item_data *di)
int r = ok_dialog(dlg, di);
if (r) return r;
save_proxy(charset, proxies.http_proxy, http_proxy);
- save_proxy(charset, proxies.ftp_proxy, ftp_proxy);
save_proxy(charset, proxies.https_proxy, https_proxy);
save_proxy(charset, proxies.socks_proxy, socks_proxy);
save_noproxy_list(charset, proxies.no_proxy, no_proxy);
@@ -1241,11 +1235,10 @@ static void dlg_proxy_options(struct terminal *term, void *xxx, void *yyy)
struct dialog *d;
int a = 0;
display_proxy(term, http_proxy, proxies.http_proxy);
- display_proxy(term, ftp_proxy, proxies.ftp_proxy);
display_proxy(term, https_proxy, proxies.https_proxy);
display_proxy(term, socks_proxy, proxies.socks_proxy);
display_noproxy_list(term, no_proxy, proxies.no_proxy);
- d = mem_calloc(sizeof(struct dialog) + (N_N + 3) * sizeof(struct dialog_item));
+ d = mem_calloc(sizeof(struct dialog) + (N_N + 2) * sizeof(struct dialog_item));
d->title = TEXT_(T_PROXIES);
d->fn = proxy_fn;
d->items[a].type = D_FIELD;
@@ -1255,11 +1248,6 @@ static void dlg_proxy_options(struct terminal *term, void *xxx, void *yyy)
a++;
d->items[a].type = D_FIELD;
d->items[a].dlen = MAX_STR_LEN;
- d->items[a].data = ftp_proxy;
- d->items[a].fn = check_proxy;
- a++;
- d->items[a].type = D_FIELD;
- d->items[a].dlen = MAX_STR_LEN;
d->items[a].data = https_proxy;
d->items[a].fn = check_proxy;
a++;
@@ -1603,93 +1591,6 @@ static void dlg_http_options(struct terminal *term, void *xxx, void *yyy)
do_dialog(term, d, getml(d, NULL));
}
-static unsigned char * const ftp_texts[] = { TEXT_(T_PASSWORD_FOR_ANONYMOUS_LOGIN), TEXT_(T_USE_PASSIVE_FTP), TEXT_(T_USE_EPRT_EPSV), TEXT_(T_USE_FAST_FTP), TEXT_(T_SET_TYPE_OF_SERVICE), NULL };
-
-static void ftpopt_fn(struct dialog_data *dlg)
-{
- struct terminal *term = dlg->win->term;
- int max = 0, min = 0;
- int w, rw;
- int y = 0;
- max_text_width(term, ftp_texts[0], &max, AL_LEFT);
- min_text_width(term, ftp_texts[0], &min, AL_LEFT);
- checkboxes_width(term, ftp_texts + 1, dlg->n - 3, &max, max_text_width);
- checkboxes_width(term, ftp_texts + 1, dlg->n - 3, &min, min_text_width);
- max_buttons_width(term, dlg->items + dlg->n - 2, 2, &max);
- min_buttons_width(term, dlg->items + dlg->n - 2, 2, &min);
- w = term->x * 9 / 10 - 2 * DIALOG_LB;
- if (w > max) w = max;
- if (w < min) w = min;
- if (w > term->x - 2 * DIALOG_LB) w = term->x - 2 * DIALOG_LB;
- if (w < 5) w = 5;
- rw = 0;
- dlg_format_text_and_field(dlg, NULL, ftp_texts[0], dlg->items, 0, &y, w, &rw, COLOR_DIALOG_TEXT, AL_LEFT);
- dlg_format_checkboxes(dlg, NULL, dlg->items + 1, dlg->n - 3, 0, &y, w, &rw, ftp_texts + 1);
- y += gf_val(1, 1 * G_BFU_FONT_SIZE);
- dlg_format_buttons(dlg, NULL, dlg->items + dlg->n - 2, 2, 0, &y, w, &rw, AL_CENTER);
- w = rw;
- dlg->xw = rw + 2 * DIALOG_LB;
- dlg->yw = y + 2 * DIALOG_TB;
- center_dlg(dlg);
- draw_dlg(dlg);
- y = dlg->y + DIALOG_TB;
- dlg_format_text_and_field(dlg, term, ftp_texts[0], dlg->items, dlg->x + DIALOG_LB, &y, w, NULL, COLOR_DIALOG_TEXT, AL_LEFT);
- y += gf_val(1, G_BFU_FONT_SIZE);
- dlg_format_checkboxes(dlg, term, dlg->items + 1, dlg->n - 3, dlg->x + DIALOG_LB, &y, w, NULL, ftp_texts + 1);
- y += gf_val(1, G_BFU_FONT_SIZE);
- dlg_format_buttons(dlg, term, dlg->items + dlg->n - 2, 2, dlg->x + DIALOG_LB, &y, w, &rw, AL_CENTER);
-}
-
-
-static void dlg_ftp_options(struct terminal *term, void *xxx, void *yyy)
-{
- int a;
- struct dialog *d;
- d = mem_calloc(sizeof(struct dialog) + 7 * sizeof(struct dialog_item));
- d->title = TEXT_(T_FTP_OPTIONS);
- d->fn = ftpopt_fn;
- d->refresh = refresh_network;
- a=0;
- d->items[a].type = D_FIELD;
- d->items[a].dlen = MAX_STR_LEN;
- d->items[a++].data = ftp_options.anon_pass;
- d->items[a].type = D_CHECKBOX;
- d->items[a].gid = 0;
- d->items[a].dlen = sizeof(int);
- d->items[a].data = (void*)&ftp_options.passive_ftp;
- a++;
- d->items[a].type = D_CHECKBOX;
- d->items[a].gid = 0;
- d->items[a].dlen = sizeof(int);
- d->items[a].data = (void*)&ftp_options.eprt_epsv;
- a++;
- d->items[a].type = D_CHECKBOX;
- d->items[a].gid = 0;
- d->items[a].dlen = sizeof(int);
- d->items[a].data = (void*)&ftp_options.fast_ftp;
- a++;
-#ifdef HAVE_IPTOS
- d->items[a].type = D_CHECKBOX;
- d->items[a].gid = 0;
- d->items[a].dlen = sizeof(int);
- d->items[a].data = (void*)&ftp_options.set_tos;
- a++;
-#endif
- d->items[a].type = D_BUTTON;
- d->items[a].gid = B_ENTER;
- d->items[a].fn = ok_dialog;
- d->items[a].text = TEXT_(T_OK);
- a++;
- d->items[a].type = D_BUTTON;
- d->items[a].gid = B_ESC;
- d->items[a].fn = cancel_dialog;
- d->items[a].text = TEXT_(T_CANCEL);
- a++;
- d->items[a].type = D_END;
- do_dialog(term, d, getml(d, NULL));
-}
-
-
static unsigned char * const prg_msg[] = {
TEXT_(T_MAILTO_PROG),
TEXT_(T_SHELL_PROG),
@@ -2761,7 +2662,6 @@ static const struct menu_item net_options_menu[] = {
{ TEXT_(T_PROXIES), cast_uchar "", TEXT_(T_HK_PROXIES), dlg_proxy_options, NULL, 0, 0 },
{ TEXT_(T_SSL_OPTIONS), cast_uchar "", TEXT_(T_HK_SSL_OPTIONS), dlg_ssl_options, NULL, 0, 0 },
{ TEXT_(T_HTTP_OPTIONS), cast_uchar "", TEXT_(T_HK_HTTP_OPTIONS), dlg_http_options, NULL, 0, 0 },
- { TEXT_(T_FTP_OPTIONS), cast_uchar "", TEXT_(T_HK_FTP_OPTIONS), dlg_ftp_options, NULL, 0, 0 },
{ NULL, NULL, 0, NULL, NULL, 0, 0 }
};
@@ -2771,7 +2671,6 @@ static const struct menu_item net_options_ipv6_menu[] = {
{ TEXT_(T_PROXIES), cast_uchar "", TEXT_(T_HK_PROXIES), dlg_proxy_options, NULL, 0, 0 },
{ TEXT_(T_SSL_OPTIONS), cast_uchar "", TEXT_(T_HK_SSL_OPTIONS), dlg_ssl_options, NULL, 0, 0 },
{ TEXT_(T_HTTP_OPTIONS), cast_uchar "", TEXT_(T_HK_HTTP_OPTIONS), dlg_http_options, NULL, 0, 0 },
- { TEXT_(T_FTP_OPTIONS), cast_uchar "", TEXT_(T_HK_FTP_OPTIONS), dlg_ftp_options, NULL, 0, 0 },
{ NULL, NULL, 0, NULL, NULL, 0, 0 }
};
diff --git a/sched.c b/sched.c
@@ -652,8 +652,6 @@ unsigned char *get_proxy_string(unsigned char *url)
return NULL;
if (*proxies.http_proxy && !casecmp(url, cast_uchar "http://", 7))
return proxies.http_proxy;
- if (*proxies.ftp_proxy && !casecmp(url, cast_uchar "ftp://", 6))
- return proxies.ftp_proxy;
if (*proxies.https_proxy && !casecmp(url, cast_uchar "https://", 8))
return proxies.https_proxy;
return NULL;