From 94e99b9ffad8332011bcca7fc199bd7063bab1d4 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Sun, 26 May 1996 21:12:50 +0000 Subject: [PATCH] Changed printf for reporting transfer stats from using %.2g to %.2f to get rid of "scientific notation" reporting (PR#bin/329) Added a switch so that if bytes/sec > 1Meg/sec, report in Meg/sec instead of Kbytes/sec --- usr.bin/ftp/ftp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c index 137e8c2198b..a98bb967b24 100644 --- a/usr.bin/ftp/ftp.c +++ b/usr.bin/ftp/ftp.c @@ -1189,8 +1189,12 @@ ptransfer(direction, bytes, t0, t1) s = td.tv_sec + (td.tv_usec / 1000000.); #define nz(x) ((x) == 0 ? 1 : (x)) bs = bytes / nz(s); - printf("%ld bytes %s in %.2g seconds (%.2g Kbytes/s)\n", - bytes, direction, s, bs / 1024.); + if(bs > ( 1024 * 1024 )) + printf("%ld bytes %s in %.2f seconds (%.2f Meg/s)\n", + bytes, direction, s, bs / (1024. * 1024.)); + else + printf("%ld bytes %s in %.2f seconds (%.2f Kbytes/s)\n", + bytes, direction, s, bs / 1024.); } }