From 94e748d0276a089ca9093767d15b5d050e0218b1 Mon Sep 17 00:00:00 2001 From: Martin Lewis Date: Thu, 10 Jan 2019 13:59:30 +0100 Subject: 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 Signed-off-by: Denys Vlasenko --- networking/wget.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'networking/wget.c') diff --git a/networking/wget.c b/networking/wget.c index 3a02de6ca..735746e38 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) { -- cgit v1.2.3