wget: implement -T SEC; rework progress meter to not use signals (it was unsafe)
function old new delta
retrieve_file_data 364 450 +86
bb_progress_update 615 682 +67
packed_usage 27406 27422 +16
wget_main 2440 2453 +13
static.wget_longopts 145 155 +10
progress_meter 199 159 -40
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/1 up/down: 192/-40) Total: 152 bytes
Signed-off-by: Bradley M. Kuhn <bkuhn@ebb.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/include/usage.src.h b/include/usage.src.h
index 57c25a0..ebd8c2e 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -4779,10 +4779,12 @@
IF_FEATURE_WGET_LONG_OPTIONS( \
"[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n" \
" [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
- " [--no-check-certificate] [-U|--user-agent AGENT] URL" \
+ " [--no-check-certificate] [-U|--user-agent AGENT]" \
+ IF_FEATURE_WGET_TIMEOUT("[-T SEC] ") " URL" \
) \
IF_NOT_FEATURE_WGET_LONG_OPTIONS( \
- "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT] URL" \
+ "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT]" \
+ IF_FEATURE_WGET_TIMEOUT("[-T SEC] ") " URL" \
)
#define wget_full_usage "\n\n" \
"Retrieve files via HTTP or FTP\n" \
@@ -4790,7 +4792,10 @@
"\n -s Spider mode - only check file existence" \
"\n -c Continue retrieval of aborted transfer" \
"\n -q Quiet" \
- "\n -P Set directory prefix to DIR" \
+ "\n -P DIR Save to DIR (default .)" \
+ IF_FEATURE_WGET_TIMEOUT( \
+ "\n -T SEC Network read timeout is SEC seconds" \
+ ) \
"\n -O FILE Save to FILE ('-' for stdout)" \
"\n -U STR Use STR for User-Agent header" \
"\n -Y Use proxy ('on' or 'off')" \