Denys Vlasenko
237bedd499
getopt32: add new syntax of 'o:+' and 'o:*' for -o NUM and -o LIST
...
In many cases, this aqllows to drop use of opt_complementary.
Approximately -400 bytes:
function old new delta
getopt32 1423 1502 +79
opt_string 17 18 +1
OPT_STR 24 25 +1
uniq_main 416 406 -10
timeout_main 279 269 -10
sulogin_main 270 260 -10
readprofile_main 1825 1815 -10
ps_main 543 533 -10
pidof_main 245 235 -10
pgrep_main 611 601 -10
od_main 2600 2590 -10
mkfs_minix_main 2684 2674 -10
mkfs_ext2_main 2603 2593 -10
microcom_main 712 702 -10
makemime_main 315 305 -10
ionice_main 282 272 -10
inetd_main 2074 2064 -10
ifplugd_main 1144 1134 -10
halt_main 353 343 -10
getopt_main 636 626 -10
fdisk_main 2854 2844 -10
env_main 206 196 -10
dmesg_main 319 309 -10
conspy_main 1214 1204 -10
awk_main 981 971 -10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/22 up/down: 81/-220) Total: -139 bytes
text data bss dec hex filename
919373 906 14060 934339 e41c3 busybox_old
918969 906 14060 933935 e402f busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-07-06 21:58:02 +02:00
Denys Vlasenko
3e134ebf6a
*: slap on a few ALIGN1/2s where appropriate
...
The result of looking at "grep -F -B2 '*fill*' busybox_unstripped.map"
text data bss dec hex filename
829901 4086 1904 835891 cc133 busybox_before
829665 4086 1904 835655 cc047 busybox
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-04-22 18:09:21 +02:00
Denys Vlasenko
6701e91d84
wget: make -T timeout work on header reads too. Closes 8636
...
function old new delta
set_alarm - 27 +27
fgets_and_trim 76 92 +16
wget_main 2610 2616 +6
open_socket 64 54 -10
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-03-17 21:52:42 +01:00
Denys Vlasenko
92e1b0826d
wget: make Bartosz's "wget --passive-ftp -nd -t 3" work
...
function old new delta
static.wget_longopts 166 234 +68
wget_main 2608 2610 +2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2015-10-20 21:51:52 +02:00
Ron Yorston
4d0c1ea478
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>
2015-10-13 14:56:22 +02:00
Denys Vlasenko
2007ef5c3c
wget: make it possible to have both SSL helpers configured
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2015-10-07 02:40:53 +02:00
Denys Vlasenko
1c6c670ed4
wget: make openssl/ssl_helper choice configurable
...
I got sick of not being able to wget a https file...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2015-10-07 01:39:40 +02:00
Maninder Singh
97f2f7ca7f
Removes stray empty line from code
...
This patch removes stray empty line from busybox code
reported by script find_stray_empty_lines
Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2015-07-13 03:25:46 +02:00
Bernhard Reutner-Fischer
d7bfee1edb
wget: fix --header to not append duplicate headers
...
function old new delta
wget_main 2551 2715 +164
wget_user_headers - 62 +62
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/0 up/down: 226/0) Total: 226 bytes
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2015-02-18 20:41:02 +01:00
Denys Vlasenko
faa9e94db6
wget: fix a case where progress bar isn't updated if writes are very slow
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-03-27 16:50:29 +01:00
Denys Vlasenko
a2796223cb
wget: fix comment
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-02-24 17:20:40 +01:00
Denys Vlasenko
53315570bb
wget: add commented-out code to use ssl_helper instead of openssl
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-02-23 23:39:47 +01:00
Denys Vlasenko
8b7e8ae224
wget: add support for https using "openssl s_client" as a helper
...
www.kernel.org started redirecting http:// to https://
making https support mandatory for any auto build scripts.
function old new delta
wget_main 2631 2971 +340
parse_url 409 471 +62
.rodata 115607 115626 +19
P_HTTPS - 6 +6
P_HTTP - 5 +5
P_FTP - 4 +4
------------------------------------------------------------------------------
(add/remove: 3/0 grow/shrink: 3/0 up/down: 436/0) Total: 436 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-02-22 14:12:29 +01:00
Denys Vlasenko
d353bfff46
wget: fix use-after-free of ->user. Closes 6836
...
function old new delta
wget_main 2207 2223 +16
parse_url 339 353 +14
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-02-03 14:09:42 +01:00
Lauri Kasanen
4967a41ba1
wget: user-friendly fallback to http
...
GNU wget: wget google.com // ok
bb before: wget google.com // wget: not an http or ftp url
function old new delta
parse_url 317 339 +22
Signed-off-by: Lauri Kasanen <curaga@operamail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-12-17 19:09:43 +01:00
Guilherme Maciel Ferreira
840ef17f63
wget: if FEATURE_CLEAN_UP, free(ptr_to_globals)
...
Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-10-16 14:43:30 +02:00
Lauri Kasanen
d074b416f8
wget: add support for connect timeout
...
function old new delta
open_socket 33 64 +31
wget_main 2182 2194 +12
Signed-off-by: Lauri Kasanen <curaga@operamail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-10-12 21:47:07 +02:00
Denys Vlasenko
982e87f2fb
Whitespace fixes
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-07-30 11:52:58 +02:00
Denys Vlasenko
ea267d518f
wget: do not abort if "_" is encountered in a HTTP header
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-07-01 15:05:09 +02:00
Denys Vlasenko
b7812ce0f7
wget: reorder fread and poll: poll only if fread returns EAGAIN. Closes 5426
...
function old new delta
retrieve_file_data 451 427 -24
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-09-03 12:49:30 +02:00
Denys Vlasenko
9c55143bbf
wget: try reading after poll timeout - stdio may have buffered data. Closes 5426
...
function old new delta
retrieve_file_data 436 451 +15
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-08-16 16:52:27 +02:00
Denys Vlasenko
aacd448601
wget: fix wget-supports--P testsuite failure. Closes 4940
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-06-17 20:21:30 +02:00
Denys Vlasenko
6144124aac
wget: make -c _not_ truncate the file
...
function old new delta
retrieve_file_data 396 436 +40
reset_beg_range_to_zero 52 45 -7
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-06-17 19:52:25 +02:00
Denys Vlasenko
bf146b8610
wget: correctly handle failure to -c (continue)
...
function old new delta
reset_beg_range_to_zero - 52 +52
wget_main 2168 2189 +21
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-06-13 17:31:07 +02:00
Vladimir Dronnikov
f5abc78579
wget: add dummy --no-cache
...
function old new delta
static.wget_longopts 155 166 +11
packed_usage 29259 29231 -28
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-06-13 17:29:41 +02:00
Denys Vlasenko
93b4a60526
wget: fix use-after-free on redirect
...
function old new delta
wget_main 2153 2168 +15
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-12-18 05:11:56 +01:00
Denys Vlasenko
dd1061b6a7
wget: URL-decode user:password before base64-encoding it into auth hdr. Closes 3625.
...
function old new delta
percent_decode_in_place - 152 +152
parse_url 304 317 +13
handle_incoming_and_exit 2795 2798 +3
httpd_main 763 760 -3
decodeString 152 - -152
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 2/1 up/down: 168/-155) Total: 13 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-09-11 21:04:02 +02:00
Denys Vlasenko
66426760be
*: remove "Options:" string from help texts
...
function old new delta
packed_usage 28706 28623 -83
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-06-05 03:58:28 +02:00
Denys Vlasenko
d506897b4e
wget: add a note about bug 3625
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-04-16 19:31:08 +02:00
Denys Vlasenko
ca18311d0a
libbb: make set_nport accept pointer to sockaddr, not to len_and_sockaddr.
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-04-07 17:52:20 +02:00
Vitaly Magerya
700fbc308d
wget: --post-data=STR should not encode STR, should send it verbatim
...
This matches GNU Wget 1.12 behavior.
Signed-off-by: Vitaly Magerya <vmagerya@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-03-27 22:33:13 +02:00
Denys Vlasenko
e2e55b0eb5
wget: move help text to .c file
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-03-21 00:37:05 +01:00
Denys Vlasenko
625f218d43
wget: fix fname_out usage wrt redirects
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-03-21 00:29:37 +01:00
Pere Orga
5369563bf9
wget: reduce bloat
...
Signed-off-by: Pere Orga <gotrunks@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-19 23:56:39 +01:00
Denys Vlasenko
28556b95fe
wget: check for final write errors for -O FILE too
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-15 11:03:53 +01:00
Denys Vlasenko
2384a357f4
wget: make "wget -O FILE URL1 URL2" concatenate output
...
Also fixes a few cases where URL1's data (like start pos)
was leaking into URL2
function old new delta
wget_main 2303 2321 +18
progress_meter 140 152 +12
retrieve_file_data 397 396 -1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 30/-1) Total: 29 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-15 00:58:36 +01:00
Pere Orga
57b4909db9
wget: fix SEGV with multiple urls and redirection
...
Signed-off-by: Pere Orga <gotrunks@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-14 23:56:07 +01:00
Denys Vlasenko
9a5b7f636d
wget: support multiple URLs on command line even without -O :)
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-13 02:49:43 +01:00
Denys Vlasenko
a3661096f2
wget: support multiple URLs on command line
...
function old new delta
wget_main 2190 2310 +120
progress_meter 124 140 +16
parse_url 288 304 +16
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 152/0) Total: 152 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-13 02:33:11 +01:00
Denys Vlasenko
a84eadf9bf
typo fix in comment
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-12 23:40:31 +01:00
Denys Vlasenko
88ad9da65e
wget: display 100% at the _end_ of chunked download
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-11 23:06:21 +01:00
Denys Vlasenko
c60f4460bb
wget: chunked mode fix. Closes bug 3229
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-11 22:23:23 +01:00
Denys Vlasenko
f9af375668
wget: explain clearerr more clearly
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-11 22:01:33 +01:00
Denys Vlasenko
8766a791e8
wget: correctly handle rare case when we get EAGAIN _on first_ read
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-11 21:42:00 +01:00
Denys Vlasenko
d55e139649
progress meter: move file name to bb_progress_t. +20 bytes
...
We were doing expensive unicode conversion on every update
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-11 18:56:13 +01:00
Denys Vlasenko
f836f01cc3
wget: shrink progress meter code; strink wget and add debug logging
...
function old new delta
fgets_and_trim - 73 +73
retrieve_file_data 367 349 -18
bb_progress_update 723 699 -24
wget_main 2220 2190 -30
ftpcmd 133 87 -46
gethdr 200 153 -47
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/5 up/down: 73/-165) Total: -92 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-10 23:02:28 +01:00
Denys Vlasenko
9213a55bf0
wget: use closed HTTP/1.1 connection, stop when we dl'ed $content_len bytes
...
function old new delta
retrieve_file_data 353 367 +14
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-10 13:23:45 +01:00
Denys Vlasenko
dee0fc9da1
save 10 bytes on strings
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-10 10:01:49 +01:00
Denys Vlasenko
0fac2f7b5b
wget: remove functions which retry on EINTR
...
function old new delta
retrieve_file_data 392 353 -39
safe_fgets 58 - -58
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-97) Total: -97 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-10 09:55:05 +01:00
Denys Vlasenko
df4e16c9af
wget: use FEATURE_COPYBUF_KB-sized buffer. Much faster for local transfers
...
function old new delta
base64enc - 53 +53
gethdr 190 200 +10
ftpcmd 129 133 +4
progress_meter 160 122 -38
retrieve_file_data 431 392 -39
base64enc_512 46 - -46
wget_main 2456 2220 -236
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 2/3 up/down: 67/-359) Total: -292 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2011-02-10 06:29:06 +01:00