diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | scp.c | 16 |
2 files changed, 19 insertions, 1 deletions
@@ -16,8 +16,10 @@ | |||
16 | - (djm) Update README to reflect AIX's status as a well supported platform. | 16 | - (djm) Update README to reflect AIX's status as a well supported platform. |
17 | From dtucker@zip.com.au | 17 | From dtucker@zip.com.au |
18 | - (tim) [Makefile.in configure.ac] replace fixpath with sed script. Patch | 18 | - (tim) [Makefile.in configure.ac] replace fixpath with sed script. Patch |
19 | by Mo DeJong. | ||
19 | - (tim) [auth.c] declare today at top of allowed_user() to keep | 20 | - (tim) [auth.c] declare today at top of allowed_user() to keep |
20 | older compilers happy. | 21 | older compilers happy. |
22 | - (tim) [scp.c] make compilers without long long happy. | ||
21 | 23 | ||
22 | 20030107 | 24 | 20030107 |
23 | - (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses. | 25 | - (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses. |
@@ -963,4 +965,4 @@ | |||
963 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 965 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
964 | ok provos@ | 966 | ok provos@ |
965 | 967 | ||
966 | $Id: ChangeLog,v 1.2556 2003/01/09 04:04:27 tim Exp $ | 968 | $Id: ChangeLog,v 1.2557 2003/01/09 04:09:30 tim Exp $ |
@@ -1175,6 +1175,7 @@ progressmeter(int flag) | |||
1175 | 1175 | ||
1176 | nspaces = MIN(getttywidth() - 79, sizeof(spaces) - 1); | 1176 | nspaces = MIN(getttywidth() - 79, sizeof(spaces) - 1); |
1177 | 1177 | ||
1178 | #ifdef HAVE_LONG_LONG_INT | ||
1178 | snprintf(buf, sizeof(buf), | 1179 | snprintf(buf, sizeof(buf), |
1179 | "\r%-45.45s%.*s%3d%% %4lld%c%c %3lld.%01d%cB/s", | 1180 | "\r%-45.45s%.*s%3d%% %4lld%c%c %3lld.%01d%cB/s", |
1180 | curfile, | 1181 | curfile, |
@@ -1188,6 +1189,21 @@ progressmeter(int flag) | |||
1188 | (int)((bytespersec % 1024) * 10 / 1024), | 1189 | (int)((bytespersec % 1024) * 10 / 1024), |
1189 | prefixes[bi] | 1190 | prefixes[bi] |
1190 | ); | 1191 | ); |
1192 | #else | ||
1193 | snprintf(buf, sizeof(buf), | ||
1194 | "\r%-45.45s%.*s%3d%% %4lld%c%c %3lu.%01d%cB/s", | ||
1195 | curfile, | ||
1196 | nspaces, | ||
1197 | spaces, | ||
1198 | ratio, | ||
1199 | (u_long)abbrevsize, | ||
1200 | prefixes[ai], | ||
1201 | ai == 0 ? ' ' : 'B', | ||
1202 | (u_long)(bytespersec / 1024), | ||
1203 | (int)((bytespersec % 1024) * 10 / 1024), | ||
1204 | prefixes[bi] | ||
1205 | ); | ||
1206 | #endif | ||
1191 | 1207 | ||
1192 | if (flag != 1 && | 1208 | if (flag != 1 && |
1193 | (statbytes <= 0 || elapsed <= 0.0 || cursize > totalbytes)) { | 1209 | (statbytes <= 0 || elapsed <= 0.0 || cursize > totalbytes)) { |