Module Name: src
Committed By: christos
Date: Fri Oct 4 18:06:19 UTC 2024
Modified Files:
src/usr.bin/ftp: progressbar.c
Log Message:
use unsigned when doing shifts.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/ftp/progressbar.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/progressbar.c
diff -u src/usr.bin/ftp/progressbar.c:1.26 src/usr.bin/ftp/progressbar.c:1.27
--- src/usr.bin/ftp/progressbar.c:1.26 Wed Sep 25 12:53:58 2024
+++ src/usr.bin/ftp/progressbar.c Fri Oct 4 14:06:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: progressbar.c,v 1.26 2024/09/25 16:53:58 christos Exp $ */
+/* $NetBSD: progressbar.c,v 1.27 2024/10/04 18:06:19 christos Exp $ */
/*-
* Copyright (c) 1997-2024 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progressbar.c,v 1.26 2024/09/25 16:53:58 christos Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.27 2024/10/04 18:06:19 christos Exp $");
#endif /* not lint */
/*
@@ -123,12 +123,12 @@ static struct timeval lastupdate;
void
progressmeter(int flag)
{
- static off_t lastsize;
- off_t cursize;
+ static uint64_t lastsize;
+ uint64_t cursize;
struct timeval now, wait;
#ifndef NO_PROGRESS
struct timeval td;
- off_t abbrevsize, bytespersec;
+ uint64_t abbrevsize, bytespersec;
double elapsed;
int ratio, i, remaining, barlength;
@@ -261,7 +261,7 @@ progressmeter(int flag)
suffixes[i]);
if (filesize > 0) {
- if (bytes <= 0 || elapsed <= 0.0 || cursize > filesize) {
+ if (bytes <= 0 || elapsed <= 0.0 || cursize > (uint64_t)filesize) {
len += snprintf(buf + len, BUFLEFT, " --:-- ETA");
} else if (wait.tv_sec >= STALLTIME) {
len += snprintf(buf + len, BUFLEFT, " - stalled -");
