diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 22:14:11 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 22:14:11 +1100 |
| commit | 6ec2fbec8b8b0e774d1d32afd26d0d13a2d1e4b7 (patch) | |
| tree | e962563f8c9d6125eb44949e9d3d446fef9c0acc /scp.c | |
| parent | 0aa3dbb5088fc8c3ca722d901fd8db55a781546b (diff) | |
| download | openssh-git-6ec2fbec8b8b0e774d1d32afd26d0d13a2d1e4b7.tar.gz | |
- djm@cvs.openbsd.org 2007/01/22 13:06:21
[scp.c]
fix detection of whether we should show progress meter or not: scp
tested isatty(stderr) but wrote the progress meter to stdout. This patch
makes it test stdout. bz#1265 reported by junkmail AT bitsculpture.com;
of dtucker@
Diffstat (limited to 'scp.c')
| -rw-r--r-- | scp.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.155 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: scp.c,v 1.156 2007/01/22 13:06:21 djm Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -380,7 +380,7 @@ main(int argc, char **argv) if ((pwd = getpwuid(userid = getuid())) == NULL) fatal("unknown user %u", (u_int) userid); - if (!isatty(STDERR_FILENO)) + if (!isatty(STDOUT_FILENO)) showprogress = 0; remin = STDIN_FILENO; |