[svn] Resurrect opt.dot_style.

src/ChangeLog

@@ -1,3 +1,15 @@
+2001-11-28  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* progress.c (dot_set_params): If PARAMS is unspecified, use
+	dot_style, if available.
+
+	* init.c: Ditto.
+
+	* main.c (main): Resurect --dot-style.
+
+	* progress.c (dot_finish): Print the quantity if we're left at the
+	beginning of a row.
+
 2001-11-27  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* cmpt.c (random): Removed.

src/init.c

@@ -122,6 +122,7 @@ static struct {
   { "dotbytes",		&opt.dot_bytes,		cmd_bytes },
   { "dotsinline",	&opt.dots_in_line,	cmd_number },
   { "dotspacing",	&opt.dot_spacing,	cmd_number },
+  { "dotstyle",		&opt.dot_style,		cmd_string },
   { "excludedirectories", &opt.excludes,	cmd_directory_vector },
   { "excludedomains",	&opt.exclude_domains,	cmd_vector },
   { "followftp",	&opt.follow_ftp,	cmd_boolean },

src/main.c

@@ -492,13 +492,7 @@ GNU General Public License for more details.\n"));
 	  setval ("header", optarg);
 	  break;
 	case 134:
-	  /* Supported for compatibility; --dot-style=foo equivalent
+	  setval ("dotstyle", optarg);
-	     to --progress=dot:foo.  */
-	  {
-	    char *tmp = alloca (3 + 1 + strlen (optarg));
-	    sprintf (tmp, "dot:%s", optarg);
-	    setval ("progress", tmp);
-	  }
 	  break;
 	case 135:
 	  setval ("htmlify", optarg);

src/options.h

@@ -139,6 +139,7 @@ struct options
   int htmlify;			/* Do we HTML-ify the OS-dependent
 				   listings? */
 
+  char *dot_style;
   long dot_bytes;		/* How many bytes in a printing
 				   dot. */
   int dots_in_line;		/* How many dots in one line. */

src/progress.c

@@ -288,6 +288,8 @@ dot_finish (void *progress, long dltime)
 
   log_set_flush (0);
 
+  if (dp->dots == 0)
+    logprintf (LOG_VERBOSE, "\n%5ldK", dp->rows * row_bytes / 1024);
   for (i = dp->dots; i < opt.dots_in_line; i++)
     {
       if (i % opt.dot_spacing == 0)
@@ -323,6 +325,9 @@ dot_finish (void *progress, long dltime)
 static void
 dot_set_params (const char *params)
 {
+  if (!params || !*params)
+    params = opt.dot_style;
+
   if (!params)
     return;
 
@@ -409,7 +414,7 @@ bar_create (long initial, long total)
   bp->width = screen_width;
   bp->buffer = xmalloc (bp->width + 1);
 
-  logputs (LOG_VERBOSE, "\n\n");
+  logputs (LOG_VERBOSE, "\n");
 
   create_image (bp, 0);
   display_image (bp->buffer);