tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 09:14:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

[scp.c] make compilers without long long happy.

Browse Source
This commit is contained in:
Tim Rice 2003-01-08 20:09:30 -08:00
parent 458c6bfa10
commit 13b2e55c36
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -16,8 +16,10 @@
- (djm) Update README to reflect AIX's status as a well supported platform. - (djm) Update README to reflect AIX's status as a well supported platform.
From dtucker@zip.com.au From dtucker@zip.com.au
- (tim) [Makefile.in configure.ac] replace fixpath with sed script. Patch - (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 - (tim) [auth.c] declare today at top of allowed_user() to keep
older compilers happy. older compilers happy.
- (tim) [scp.c] make compilers without long long happy.
20030107 20030107
- (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses. - (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; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ 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 $

16
scp.c
View File

@ -1175,6 +1175,7 @@ progressmeter(int flag)
nspaces = MIN(getttywidth() - 79, sizeof(spaces) - 1); nspaces = MIN(getttywidth() - 79, sizeof(spaces) - 1);
#ifdef HAVE_LONG_LONG_INT
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"\r%-45.45s%.*s%3d%% %4lld%c%c %3lld.%01d%cB/s", "\r%-45.45s%.*s%3d%% %4lld%c%c %3lld.%01d%cB/s",
curfile, curfile,
@ -1188,6 +1189,21 @@ progressmeter(int flag)
(int)((bytespersec % 1024) * 10 / 1024), (int)((bytespersec % 1024) * 10 / 1024),
prefixes[bi] 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 && if (flag != 1 &&
(statbytes <= 0 || elapsed <= 0.0 || cursize > totalbytes)) { (statbytes <= 0 || elapsed <= 0.0 || cursize > totalbytes)) {