[svn] Default the progress implementation to "bar".

Published in <sxsu1vgfqx7.fsf@florida.arsdigita.de>.

diff --git a/NEWS b/NEWS
index d9849ef0f57c391afcca172c1111d7fc611a06a4..8e786e2f52bdbc99f44b95d0c5387f14c6acff93 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,11 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
 \f
 * 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 b7225adea33f9b7d641cf758a1be3baa153a6fb5..04267dae2b6afdb600627a770e038a5725f90b07 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-27  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * progress.c: Change the default progress implementation to "bar".
+
 2001-11-27  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * progress.c (bar_create): Print two newlines.

diff --git a/src/progress.c b/src/progress.c
index efc03d6d355202a8234bb0d2d3212a9a8c944a05..c7a18f1e0913d597ceef708b9cf15b0aecbb1d05 100644 (file)
--- 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;
     }