summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2003-01-08 20:09:30 -0800
committerTim Rice <tim@multitalents.net>2003-01-08 20:09:30 -0800
commit13b2e55c36ec316bd4ec15e830c9eae888d2cb68 (patch)
tree58bbc9cf1c98e818b6ad0606c2c6b03f70947c04
parent458c6bfa10bb370487e9e27f540e1a7e7a5909cc (diff)
[scp.c] make compilers without long long happy.
-rw-r--r--ChangeLog4
-rw-r--r--scp.c16
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index db9c94f1..6b340931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,8 +16,10 @@
- (djm) Update README to reflect AIX's status as a well supported platform.
From dtucker@zip.com.au
- (tim) [Makefile.in configure.ac] replace fixpath with sed script. Patch
+ by Mo DeJong.
- (tim) [auth.c] declare today at top of allowed_user() to keep
older compilers happy.
+ - (tim) [scp.c] make compilers without long long happy.
20030107
- (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses.
@@ -963,4 +965,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2556 2003/01/09 04:04:27 tim Exp $
+$Id: ChangeLog,v 1.2557 2003/01/09 04:09:30 tim Exp $
diff --git a/scp.c b/scp.c
index 71d2a0d9..8324549d 100644
--- a/scp.c
+++ b/scp.c
@@ -1175,6 +1175,7 @@ progressmeter(int flag)
nspaces = MIN(getttywidth() - 79, sizeof(spaces) - 1);
+#ifdef HAVE_LONG_LONG_INT
snprintf(buf, sizeof(buf),
"\r%-45.45s%.*s%3d%% %4lld%c%c %3lld.%01d%cB/s",
curfile,
@@ -1188,6 +1189,21 @@ progressmeter(int flag)
(int)((bytespersec % 1024) * 10 / 1024),
prefixes[bi]
);
+#else
+ snprintf(buf, sizeof(buf),
+ "\r%-45.45s%.*s%3d%% %4lld%c%c %3lu.%01d%cB/s",
+ curfile,
+ nspaces,
+ spaces,
+ ratio,
+ (u_long)abbrevsize,
+ prefixes[ai],
+ ai == 0 ? ' ' : 'B',
+ (u_long)(bytespersec / 1024),
+ (int)((bytespersec % 1024) * 10 / 1024),
+ prefixes[bi]
+ );
+#endif
if (flag != 1 &&
(statbytes <= 0 || elapsed <= 0.0 || cursize > totalbytes)) {