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

1 files changed, 6 insertions, 2 deletions

diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index 137e8c2..a98bb96 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.);
 	}
 }