diff options
| author | tim <tim> | 2003-01-09 04:09:30 +0000 |
|---|---|---|
| committer | tim <tim> | 2003-01-09 04:09:30 +0000 |
| commit | 08d33d47d87f75fd57157c7efac4491ab1c6e33d (patch) | |
| tree | 8c5d4d176f4f67edda38dcc8a1bacdd324fc7197 | |
| parent | ae06dc94042dcf0e42f3e8dd1a3031a2f3e05388 (diff) | |
| download | openssh-08d33d47d87f75fd57157c7efac4491ab1c6e33d.tar.gz | |
[scp.c] make compilers without long long happy.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | scp.c | 16 |
2 files changed, 19 insertions, 1 deletions
@@ -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 $ @@ -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)) { |