From 253dee6111409401649db8673ca7b5a08b0bd289 Mon Sep 17 00:00:00 2001 From: lukem Date: Tue, 19 Jul 2005 00:41:05 +0000 Subject: 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. --- progressbar.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/progressbar.c b/progressbar.c index 18f12ef..43b1851 100644 --- 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 #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, -- cgit v1.2.3-56-ge451