diff options
| author |   lukem <lukem@NetBSD.org> | 2005-07-19 00:41:05 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2005-07-19 00:41:05 +0000 |
| commit | 253dee6111409401649db8673ca7b5a08b0bd289 (patch) | |
| tree | d434b647da41f6f484eae9d537d8340f2a5c47d7 | |
| parent | ea96c8a5f8767f918c070f79cf6f474df343f7b1 (diff) | |
| download | bsd-progress-253dee6111409401649db8673ca7b5a08b0bd289.tar.gz bsd-progress-253dee6111409401649db8673ca7b5a08b0bd289.tar.zst bsd-progress-253dee6111409401649db8673ca7b5a08b0bd289.zip | |
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.
| -rw-r--r-- | progressbar.c | 9 |
1 files 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 <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, |