[svn] Allow the user to force bar progress.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index cf9ba8d4caf58aace1b8605a093efaf80e5fc4c8..070aa957f84c698271094f46f9d85d9a291aa75e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-23  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * progress.c (bar_set_params): Allow the user to force the use of
+       the bar.
+
 2001-11-23  Lemble Gregory  <gregory.lemble@st.com>
 
        * gen_sslfunc.c (ssl_init_prng): New function; seed the SSL RNG.

diff --git a/src/progress.c b/src/progress.c
index 1e278598432b9888511c2720629f0bdaa621d2ef..6c721cda902e4baf651c08016d2d74c5d510cffd 100644 (file)
--- a/src/progress.c
+++ b/src/progress.c
@@ -592,20 +592,25 @@ display_image (char *buf)
 }
 
 static void
-bar_set_params (const char *ignored)
+bar_set_params (const char *params)
 {
   int sw;
 
-  if (opt.lfilename
+  if ((opt.lfilename
 #ifdef HAVE_ISATTY
-      || !isatty (fileno (stderr))
+       || !isatty (fileno (stderr))
 #else
-      1
+       1
 #endif
-      )
+       )
+      && !(params != NULL
+          && 0 == strcmp (params, "force")))
     {
-      /* We're not printing to a TTY.  Revert to the fallback
-        display. */
+      /* 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);
       return;
     }