projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention bps units of terminal speeds (FWLIW).
[u/mdw/putty]
/
scp.c
diff --git
a/scp.c
b/scp.c
index
4334d9f
..
f7fa255
100644
(file)
--- a/
scp.c
+++ b/
scp.c
@@
-450,7
+450,8
@@
static void do_cmd(char *host, char *user, char *cmd)
back = &ssh_backend;
back = &ssh_backend;
- err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,0);
+ err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,
+ 0, cfg.tcp_keepalives);
if (err != NULL)
bump("ssh_init: %s", err);
logctx = log_init(NULL, &cfg);
if (err != NULL)
bump("ssh_init: %s", err);
logctx = log_init(NULL, &cfg);
@@
-470,7
+471,7
@@
static void print_stats(char *name, unsigned long size, unsigned long done,
{
float ratebs;
unsigned long eta;
{
float ratebs;
unsigned long eta;
- char
etastr[10]
;
+ char
*etastr
;
int pct;
int len;
int elap;
int pct;
int len;
int elap;
@@
-486,8
+487,8
@@
static void print_stats(char *name, unsigned long size, unsigned long done,
eta = size - done;
else
eta = (unsigned long) ((size - done) / ratebs);
eta = size - done;
else
eta = (unsigned long) ((size - done) / ratebs);
-
sprintf(etastr,
"%02ld:%02ld:%02ld",
- eta / 3600, (eta % 3600) / 60, eta % 60);
+
etastr = dupprintf(
"%02ld:%02ld:%02ld",
+
eta / 3600, (eta % 3600) / 60, eta % 60);
pct = (int) (100 * (done * 1.0 / size));
pct = (int) (100 * (done * 1.0 / size));
@@
-506,6
+507,8
@@
static void print_stats(char *name, unsigned long size, unsigned long done,
fflush(stdout);
}
fflush(stdout);
}
+
+ free(etastr);
}
/*
}
/*