diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-10-02 18:33:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-10-02 18:33:57 +0000 |
| commit | df60ccbc0cd48910b9bd784c1953ee34847ccc9b (patch) | |
| tree | 271573e615be7c2f0af467b7e3f549f1e27c6318 /usr.bin | |
| parent | 9177daecff398158efc567cd384eafcf5aaafcea (diff) | |
isatty() fixes for the progress meter; markus.friedl@informatik.uni-erlangen.de
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/scp.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c index dc096fe6d0a..64ba361ba2e 100644 --- a/usr.bin/ssh/scp.c +++ b/usr.bin/ssh/scp.c @@ -42,11 +42,11 @@ and ssh has the necessary privileges.) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scp.c,v 1.6 1999/09/30 21:25:03 aaron Exp $ + * $Id: scp.c,v 1.7 1999/10/02 18:33:56 deraadt Exp $ */ #include "includes.h" -RCSID("$Id: scp.c,v 1.6 1999/09/30 21:25:03 aaron Exp $"); +RCSID("$Id: scp.c,v 1.7 1999/10/02 18:33:56 deraadt Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -280,6 +280,9 @@ main(argc, argv) if ((pwd = getpwuid(userid = getuid())) == NULL) fatal("unknown user %d", (int)userid); + if (! isatty(STDERR_FILENO)) + showprogress = 0; + remin = STDIN_FILENO; remout = STDOUT_FILENO; @@ -773,6 +776,11 @@ bad: run_err("%s: %s", np, strerror(errno)); } cp = bp->buf; wrerr = NO; + + if (showprogress) { + totalbytes = size; + progressmeter(-1); + } for (count = i = 0; i < size; i += 4096) { amt = 4096; if (i + amt > size) @@ -787,6 +795,7 @@ bad: run_err("%s: %s", np, strerror(errno)); } amt -= j; cp += j; + statbytes += j; } while (amt > 0); if (count == bp->cnt) { /* Keep reading so we stay sync'd up. */ @@ -801,6 +810,8 @@ bad: run_err("%s: %s", np, strerror(errno)); cp = bp->buf; } } + if (showprogress) + progressmeter(1); if (count != 0 && wrerr == NO && (j = write(ofd, bp->buf, count)) != count) { wrerr = YES; @@ -949,7 +960,7 @@ run_err(const char *fmt, ...) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scp.c,v 1.6 1999/09/30 21:25:03 aaron Exp $ + * $Id: scp.c,v 1.7 1999/10/02 18:33:56 deraadt Exp $ */ char * |