diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-10-12 10:51:25 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-13 14:56:22 +0200 |
| commit | 4d0c1ea4784c9844f8468d97ca5c26d3c70f9921 (patch) | |
| tree | 3130f0d48e0e370e20dc04ff270d0ed8e8388f6e /networking/wget.c | |
| parent | ab3964db4e75e34f6f9347406c5fd2bced04f2dd (diff) | |
| download | busybox-w32-4d0c1ea4784c9844f8468d97ca5c26d3c70f9921.tar.gz busybox-w32-4d0c1ea4784c9844f8468d97ca5c26d3c70f9921.tar.bz2 busybox-w32-4d0c1ea4784c9844f8468d97ca5c26d3c70f9921.zip | |
wget: shrink code if https isn't supported
If FEATURE_WGET_OPENSSL and FEATURE_WGET_SSL_HELPER are both disabled
there's no point in checking for https URLs.
function old new delta
P_HTTPS 6 - -6
.rodata 155501 155469 -32
parse_url 476 423 -53
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/2 up/down: 0/-91) Total: -91 bytes
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/wget.c')
| -rw-r--r-- | networking/wget.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/networking/wget.c b/networking/wget.c index d4a9c0cb1..af9c53c22 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
| @@ -147,7 +147,9 @@ struct host_info { | |||
| 147 | }; | 147 | }; |
| 148 | static const char P_FTP[] = "ftp"; | 148 | static const char P_FTP[] = "ftp"; |
| 149 | static const char P_HTTP[] = "http"; | 149 | static const char P_HTTP[] = "http"; |
| 150 | #if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER | ||
| 150 | static const char P_HTTPS[] = "https"; | 151 | static const char P_HTTPS[] = "https"; |
| 152 | #endif | ||
| 151 | 153 | ||
| 152 | #if ENABLE_FEATURE_WGET_LONG_OPTIONS | 154 | #if ENABLE_FEATURE_WGET_LONG_OPTIONS |
| 153 | /* User-specified headers prevent using our corresponding built-in headers. */ | 155 | /* User-specified headers prevent using our corresponding built-in headers. */ |
| @@ -410,10 +412,12 @@ static void parse_url(const char *src_url, struct host_info *h) | |||
| 410 | if (strcmp(url, P_FTP) == 0) { | 412 | if (strcmp(url, P_FTP) == 0) { |
| 411 | h->port = bb_lookup_port(P_FTP, "tcp", 21); | 413 | h->port = bb_lookup_port(P_FTP, "tcp", 21); |
| 412 | } else | 414 | } else |
| 415 | #if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER | ||
| 413 | if (strcmp(url, P_HTTPS) == 0) { | 416 | if (strcmp(url, P_HTTPS) == 0) { |
| 414 | h->port = bb_lookup_port(P_HTTPS, "tcp", 443); | 417 | h->port = bb_lookup_port(P_HTTPS, "tcp", 443); |
| 415 | h->protocol = P_HTTPS; | 418 | h->protocol = P_HTTPS; |
| 416 | } else | 419 | } else |
| 420 | #endif | ||
| 417 | if (strcmp(url, P_HTTP) == 0) { | 421 | if (strcmp(url, P_HTTP) == 0) { |
| 418 | http: | 422 | http: |
| 419 | h->port = bb_lookup_port(P_HTTP, "tcp", 80); | 423 | h->port = bb_lookup_port(P_HTTP, "tcp", 80); |