tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2007/01/22 13:06:21

Browse Source 
[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@
This commit is contained in:
Darren Tucker 2007-02-19 22:14:11 +11:00
parent 0aa3dbb508
commit 6ec2fbec8b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -26,6 +26,12 @@
return error from do_upload() when a write fails. fixes bz#1252: zero return error from do_upload() when a write fails. fixes bz#1252: zero
exit status from sftp when uploading to a full device. report from exit status from sftp when uploading to a full device. report from
jirkat AT atlas.cz; ok dtucker@ jirkat AT atlas.cz; ok dtucker@
- 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@
20070128 20070128
- (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52) - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52)
@ -2721,4 +2727,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4614 2007/02/19 11:13:39 dtucker Exp $ $Id: ChangeLog,v 1.4615 2007/02/19 11:14:11 dtucker Exp $

4
scp.c
View File

@ -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 * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * 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) if ((pwd = getpwuid(userid = getuid())) == NULL)
fatal("unknown user %u", (u_int) userid); fatal("unknown user %u", (u_int) userid);
if (!isatty(STDERR_FILENO)) if (!isatty(STDOUT_FILENO))
showprogress = 0; showprogress = 0;
remin = STDIN_FILENO; remin = STDIN_FILENO;