Revert back to using an int (instead of size_t) for holding a value that may

be negative.
Fixes progressbar display on terminals <43 columns wide.
Bug noted and solution suggested by Gavan Fantom.

diff --git a/progressbar.c b/progressbar.c
index 18f12ef383ad0d28ec028423f72d5a5f325e1418..43b185187c9248939739ac6ae2a8bfe70c41b712 100644 (file)
--- a/progressbar.c
+++ b/progressbar.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: progressbar.c,v 1.10 2005/06/09 16:38:29 lukem Exp $   */
+/*     $NetBSD: progressbar.c,v 1.11 2005/07/19 00:41:05 lukem Exp $   */
 
 /*-
  * Copyright (c) 1997-2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: progressbar.c,v 1.10 2005/06/09 16:38:29 lukem Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.11 2005/07/19 00:41:05 lukem Exp $");
 #endif /* not lint */
 
 /*
@@ -121,8 +121,7 @@ progressmeter(int flag)
        struct timeval td;
        off_t abbrevsize, bytespersec;
        double elapsed;
-       int ratio, i, remaining;
-       size_t barlength;
+       int ratio, i, remaining, barlength;
 
                        /*
                         * Work variables for progress bar.
@@ -216,7 +215,7 @@ progressmeter(int flag)
                         */
                barlength = MIN(sizeof(buf) - 1, ttywidth) - BAROVERHEAD;
                if (prefix)
-                       barlength -= strlen(prefix);
+                       barlength -= (int)strlen(prefix);
                if (barlength > 0) {
                        i = barlength * ratio / 100;
                        len += snprintf(buf + len, BUFLEFT,