diff options
author | Damien Miller <djm@mindrot.org> | 1999-10-28 15:23:30 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-10-28 15:23:30 +1000 |
commit | 01ab4a25c84cdfba15c1c781ef93d24285d76eb5 (patch) | |
tree | a005726f953226ea49ac81c313da7e5bd2be0a70 /scp.c | |
parent | 29d685212f4792c084052f07006f57a50cc6f2c8 (diff) |
Merged latest OpenBSD changes.
Diffstat (limited to 'scp.c')
-rw-r--r-- | scp.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -42,11 +42,11 @@ and ssh has the necessary privileges.) | |||
42 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 42 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
43 | * SUCH DAMAGE. | 43 | * SUCH DAMAGE. |
44 | * | 44 | * |
45 | * $Id: scp.c,v 1.1 1999/10/27 03:42:45 damien Exp $ | 45 | * $Id: scp.c,v 1.2 1999/10/28 05:23:30 damien Exp $ |
46 | */ | 46 | */ |
47 | 47 | ||
48 | #include "includes.h" | 48 | #include "includes.h" |
49 | RCSID("$Id: scp.c,v 1.1 1999/10/27 03:42:45 damien Exp $"); | 49 | RCSID("$Id: scp.c,v 1.2 1999/10/28 05:23:30 damien Exp $"); |
50 | 50 | ||
51 | #include "ssh.h" | 51 | #include "ssh.h" |
52 | #include "xmalloc.h" | 52 | #include "xmalloc.h" |
@@ -976,7 +976,7 @@ run_err(const char *fmt, ...) | |||
976 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 976 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
977 | * SUCH DAMAGE. | 977 | * SUCH DAMAGE. |
978 | * | 978 | * |
979 | * $Id: scp.c,v 1.1 1999/10/27 03:42:45 damien Exp $ | 979 | * $Id: scp.c,v 1.2 1999/10/28 05:23:30 damien Exp $ |
980 | */ | 980 | */ |
981 | 981 | ||
982 | char * | 982 | char * |
@@ -1183,7 +1183,7 @@ progressmeter(int flag) | |||
1183 | " - stalled -"); | 1183 | " - stalled -"); |
1184 | } else { | 1184 | } else { |
1185 | remaining = (int)(totalbytes / (statbytes / elapsed) - elapsed); | 1185 | remaining = (int)(totalbytes / (statbytes / elapsed) - elapsed); |
1186 | i = elapsed / 3600; | 1186 | i = remaining / 3600; |
1187 | if (i) | 1187 | if (i) |
1188 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), | 1188 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), |
1189 | "%2d:", i); | 1189 | "%2d:", i); |