diff options
| author | Martin Lewis | 2019-01-10 13:59:30 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2019-01-17 13:46:14 +0100 |
| commit | 94e748d0276a089ca9093767d15b5d050e0218b1 (patch) | |
| tree | 623cddcb88d63e8d30d8c206feb4043d096b0b3a | |
| parent | edb74f40191458f3ae581e3ad385832906f7a39e (diff) | |
| download | busybox-94e748d0276a089ca9093767d15b5d050e0218b1.zip busybox-94e748d0276a089ca9093767d15b5d050e0218b1.tar.gz | |
wget: don't notify on download begin and end if quiet
When printing notification on download start and end,
mistakenly, it didn't respect the quiet option
function old new delta
retrieve_file_data 561 579 +18
wget_main 2432 2437 +5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 23/0) Total: 23 bytes
Signed-off-by: Martin Lewis <martin.lewis.x84@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/wget.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/networking/wget.c b/networking/wget.c index 3a02de6..735746e 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -876,10 +876,12 @@ static void NOINLINE retrieve_file_data(FILE *dfp) polldata.fd = fileno(dfp); polldata.events = POLLIN | POLLPRI; #endif - if (G.output_fd == 1) - fprintf(stderr, "writing to stdout\n"); - else - fprintf(stderr, "saving to '%s'\n", G.fname_out); + if (!(option_mask32 & WGET_OPT_QUIET)) { + if (G.output_fd == 1) + fprintf(stderr, "writing to stdout\n"); + else + fprintf(stderr, "saving to '%s'\n", G.fname_out); + } progress_meter(PROGRESS_START); if (G.chunked) @@ -1025,10 +1027,12 @@ static void NOINLINE retrieve_file_data(FILE *dfp) G.chunked = 0; /* makes it show 100% even for chunked download */ G.got_clen = 1; /* makes it show 100% even for download of (formerly) unknown size */ progress_meter(PROGRESS_END); - if (G.output_fd == 1) - fprintf(stderr, "written to stdout\n"); - else - fprintf(stderr, "'%s' saved\n", G.fname_out); + if (!(option_mask32 & WGET_OPT_QUIET)) { + if (G.output_fd == 1) + fprintf(stderr, "written to stdout\n"); + else + fprintf(stderr, "'%s' saved\n", G.fname_out); + } } static void download_one_url(const char *url) @@ -1389,7 +1393,8 @@ However, in real world it was observed that some web servers G.output_fd = -1; } } else { - fprintf(stderr, "remote file exists\n"); + if (!(option_mask32 & WGET_OPT_QUIET)) + fprintf(stderr, "remote file exists\n"); } if (dfp != sfp) { |