Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 16:31:24 +00:00
Code Issues Projects Releases Wiki Activity

add quiet mode support.

Browse Source 
If wget compiled without statusbar then -q option is accepted but has no effect.
If wget compiled with statusbar -q turns it off.
This commit is contained in:
Glenn L McGrath 2000-12-09 08:12:06 +00:00
parent 8c28fd7849
commit 1bca5ed886
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
networking/wget.c
View File

@ -62,15 +62,18 @@ int wget_main(int argc, char **argv)
long beg_range = 0L; /* range at which continue begins */ long beg_range = 0L; /* range at which continue begins */
int got_clen = 0; /* got content-length: from server */ int got_clen = 0; /* got content-length: from server */
FILE *output; /* socket to web server */ FILE *output; /* socket to web server */
int quiet_flag = FALSE;
/* /*
* Crack command line. * Crack command line.
*/ */
while ((n = getopt(argc, argv, "cO:")) != EOF) { while ((n = getopt(argc, argv, "cqO:")) != EOF) {
switch (n) { switch (n) {
case 'c': case 'c':
++do_continue; ++do_continue;
break; break;
case 'q':
quiet_flag = TRUE;
break;
case 'O': case 'O':
/* can't set fname_out to NULL if outputting to stdout, because /* can't set fname_out to NULL if outputting to stdout, because
* this gets interpreted as the auto-gen output filename * this gets interpreted as the auto-gen output filename
@ -196,13 +199,15 @@ int wget_main(int argc, char **argv)
*/ */
#ifdef BB_FEATURE_STATUSBAR #ifdef BB_FEATURE_STATUSBAR
statbytes=0; statbytes=0;
progressmeter(-1); if (quiet_flag==FALSE)
progressmeter(-1);
#endif #endif
while (filesize > 0 && (n = fread(buf, 1, sizeof(buf), sfp)) > 0) { while (filesize > 0 && (n = fread(buf, 1, sizeof(buf), sfp)) > 0) {
fwrite(buf, 1, n, output); fwrite(buf, 1, n, output);
#ifdef BB_FEATURE_STATUSBAR #ifdef BB_FEATURE_STATUSBAR
statbytes+=n; statbytes+=n;
progressmeter(1); if (quiet_flag==FALSE)
progressmeter(1);
#endif #endif
if (got_clen) if (got_clen)
filesize -= n; filesize -= n;
@ -486,7 +491,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: wget.c,v 1.11 2000/12/07 22:42:11 andersen Exp $ * $Id: wget.c,v 1.12 2000/12/09 08:12:06 bug1 Exp $
*/ */

15
wget.c
View File

@ -62,15 +62,18 @@ int wget_main(int argc, char **argv)
long beg_range = 0L; /* range at which continue begins */ long beg_range = 0L; /* range at which continue begins */
int got_clen = 0; /* got content-length: from server */ int got_clen = 0; /* got content-length: from server */
FILE *output; /* socket to web server */ FILE *output; /* socket to web server */
int quiet_flag = FALSE;
/* /*
* Crack command line. * Crack command line.
*/ */
while ((n = getopt(argc, argv, "cO:")) != EOF) { while ((n = getopt(argc, argv, "cqO:")) != EOF) {
switch (n) { switch (n) {
case 'c': case 'c':
++do_continue; ++do_continue;
break; break;
case 'q':
quiet_flag = TRUE;
break;
case 'O': case 'O':
/* can't set fname_out to NULL if outputting to stdout, because /* can't set fname_out to NULL if outputting to stdout, because
* this gets interpreted as the auto-gen output filename * this gets interpreted as the auto-gen output filename
@ -196,13 +199,15 @@ int wget_main(int argc, char **argv)
*/ */
#ifdef BB_FEATURE_STATUSBAR #ifdef BB_FEATURE_STATUSBAR
statbytes=0; statbytes=0;
progressmeter(-1); if (quiet_flag==FALSE)
progressmeter(-1);
#endif #endif
while (filesize > 0 && (n = fread(buf, 1, sizeof(buf), sfp)) > 0) { while (filesize > 0 && (n = fread(buf, 1, sizeof(buf), sfp)) > 0) {
fwrite(buf, 1, n, output); fwrite(buf, 1, n, output);
#ifdef BB_FEATURE_STATUSBAR #ifdef BB_FEATURE_STATUSBAR
statbytes+=n; statbytes+=n;
progressmeter(1); if (quiet_flag==FALSE)
progressmeter(1);
#endif #endif
if (got_clen) if (got_clen)
filesize -= n; filesize -= n;
@ -486,7 +491,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: wget.c,v 1.11 2000/12/07 22:42:11 andersen Exp $ * $Id: wget.c,v 1.12 2000/12/09 08:12:06 bug1 Exp $
*/ */