From 2772a3f8643d085b78110afdd1b84296c04baca9 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 6 Aug 2001 21:17:12 +0000 Subject: - deraadt@cvs.openbsd.org 2001/07/27 17:26:16 [scp.c] shorten lines --- ChangeLog | 5 ++++- scp.c | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index eab49e844..af21b0870 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,9 @@ [ssh.c] If smart card support is compiled in and a smart card is being used 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 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on @@ -6159,4 +6162,4 @@ - Wrote replacements for strlcpy and mkdtemp - 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 $ diff --git a/scp.c b/scp.c index daa3f9909..71fa299db 100644 --- a/scp.c +++ b/scp.c @@ -75,7 +75,7 @@ */ #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 "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]; if (verbose_mode) - fprintf(stderr, "Executing: program %s host %s, user %s, command %s\n", - ssh_program, host, remuser ? remuser : "(unspecified)", cmd); + fprintf(stderr, + "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 @@ -830,7 +832,8 @@ bad: run_err("%s: %s", np, strerror(errno)); count += amt; do { j = read(remin, cp, amt); - if (j == -1 && (errno == EINTR || errno == EAGAIN)) { + if (j == -1 && (errno == EINTR || + errno == EAGAIN)) { continue; } else if (j <= 0) { run_err("%s", j ? strerror(errno) : -- cgit v1.2.3