tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2001/07/27 17:26:16 

[scp.c]
     shorten lines
This commit is contained in:
Ben Lindstrom 2001-08-06 21:17:12 +00:00
parent 711b04a56a
commit 2772a3f864
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -49,6 +49,9 @@
[ssh.c] [ssh.c]
If smart card support is compiled in and a smart card is being used If smart card support is compiled in and a smart card is being used
for authentication, make it the first method used. markus@ OK for authentication, make it the first method used. markus@ OK
- deraadt@cvs.openbsd.org 2001/07/27 17:26:16
[scp.c]
shorten lines
20010803 20010803
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@ -6159,4 +6162,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1439 2001/08/06 21:12:42 mouring Exp $ $Id: ChangeLog,v 1.1440 2001/08/06 21:17:12 mouring Exp $

11
scp.c
View File

@ -75,7 +75,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: scp.c,v 1.77 2001/07/18 16:45:52 mouring Exp $"); RCSID("$OpenBSD: scp.c,v 1.78 2001/07/27 17:26:16 deraadt Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "atomicio.h" #include "atomicio.h"
@ -143,8 +143,10 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
int pin[2], pout[2], reserved[2]; int pin[2], pout[2], reserved[2];
if (verbose_mode) if (verbose_mode)
fprintf(stderr, "Executing: program %s host %s, user %s, command %s\n", fprintf(stderr,
ssh_program, host, remuser ? remuser : "(unspecified)", cmd); "Executing: program %s host %s, user %s, command %s\n",
ssh_program, host,
remuser ? remuser : "(unspecified)", cmd);
/* /*
* Reserve two descriptors so that the real pipes won't get * Reserve two descriptors so that the real pipes won't get
@ -830,7 +832,8 @@ bad: run_err("%s: %s", np, strerror(errno));
count += amt; count += amt;
do { do {
j = read(remin, cp, amt); j = read(remin, cp, amt);
if (j == -1 && (errno == EINTR || errno == EAGAIN)) { if (j == -1 && (errno == EINTR ||
errno == EAGAIN)) {
continue; continue;
} else if (j <= 0) { } else if (j <= 0) {
run_err("%s", j ? strerror(errno) : run_err("%s", j ? strerror(errno) :