=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/util.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- src/usr.bin/ftp/util.c 2001/06/18 21:20:17 1.25 +++ src/usr.bin/ftp/util.c 2001/07/12 05:17:08 1.26 @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.25 2001/06/18 21:20:17 millert Exp $ */ +/* $OpenBSD: util.c,v 1.26 2001/07/12 05:17:08 deraadt Exp $ */ /* $NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $ */ /* @@ -35,7 +35,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: util.c,v 1.25 2001/06/18 21:20:17 millert Exp $"; +static char rcsid[] = "$OpenBSD: util.c,v 1.26 2001/07/12 05:17:08 deraadt Exp $"; #endif /* not lint */ /* @@ -702,7 +702,7 @@ abbrevsize >>= 10; } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), - " %5qd %c%c ", (quad_t)abbrevsize, prefixes[i], + " %5lld %c%c ", (long long)abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' : 'B'); timersub(&now, &lastupdate, &wait); @@ -791,8 +791,8 @@ if (bs > (1024 * 1024)) meg = 1; (void)snprintf(buf, sizeof(buf), - "%qd byte%s %s in %.2f seconds (%.2f %sB/s)\n", - (quad_t)bytes, bytes == 1 ? "" : "s", direction, elapsed, + "%lld byte%s %s in %.2f seconds (%.2f %sB/s)\n", + (long long)bytes, bytes == 1 ? "" : "s", direction, elapsed, bs / (1024.0 * (meg ? 1024.0 : 1.0)), meg ? "M" : "K"); if (siginfo && bytes > 0 && elapsed > 0.0 && filesize >= 0 && bytes + restart_point <= filesize) {