From baf875019793063efb30bb283b5f1a69fa588506 Mon Sep 17 00:00:00 2001 From: hniksic Date: Tue, 27 Nov 2001 02:29:45 -0800 Subject: [PATCH] [svn] Default the progress implementation to "bar". Published in . --- NEWS | 7 +++++-- src/ChangeLog | 4 ++++ src/progress.c | 15 ++++++++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index d9849ef0..8e786e2f 100644 --- a/NEWS +++ b/NEWS @@ -7,8 +7,11 @@ Please send GNU Wget bug reports to . * Changes in Wget 1.8. -** A new progress indicator is now available. Try it with ---progress=bar or using `progress = bar' in `.wgetrc'. +** A new progress indicator is now available and used by default. +You can choose the progress bar type with `--progress=TYPE'. Two +types are available, "bar" (the new default), and "dot" (the old +dotted indicator). You can permanently revert to the old progress +indicator by putting `progress = dot' in your `.wgetrc'. ** "Recursive retrieval" has been revamped: diff --git a/src/ChangeLog b/src/ChangeLog index b7225ade..04267dae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-11-27 Hrvoje Niksic + + * progress.c: Change the default progress implementation to "bar". + 2001-11-27 Hrvoje Niksic * progress.c (bar_create): Print two newlines. diff --git a/src/progress.c b/src/progress.c index efc03d6d..c7a18f1e 100644 --- a/src/progress.c +++ b/src/progress.c @@ -62,13 +62,18 @@ static struct progress_implementation implementations[] = { }; static struct progress_implementation *current_impl; -/* Default progress implementation should be something that works +/* Progress implementation used by default. Can be overriden in + wgetrc or by the fallback one. */ + +#define DEFAULT_PROGRESS_IMPLEMENTATION "bar" + +/* Fallnback progress implementation should be something that works under all display types. If you put something other than "dot" here, remember that bar_set_params tries to switch to this if we're not running on a TTY. So changing this to "bar" could cause infloop. */ -#define DEFAULT_PROGRESS_IMPLEMENTATION "dot" +#define FALLBACK_PROGRESS_IMPLEMENTATION "dot" /* Return non-zero if NAME names a valid progress bar implementation. The characters after the first : will be ignored. */ @@ -659,9 +664,9 @@ bar_set_params (const char *params) /* We're not printing to a TTY, so revert to the fallback display. #### We're recursively calling set_progress_implementation here, which is slightly kludgy. - It would be nicer if that function could resolve this problem - itself. */ - set_progress_implementation (NULL); + It would be nicer if we provided that function a return value + indicating a failure of some sort. */ + set_progress_implementation (FALLBACK_PROGRESS_IMPLEMENTATION); return; } -- 2.39.2