summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/scp.c b/scp.c
index daa3f9909..71fa299db 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.77 2001/07/18 16:45:52 mouring Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.78 2001/07/27 17:26:16 deraadt Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -143,8 +143,10 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
143 int pin[2], pout[2], reserved[2]; 143 int pin[2], pout[2], reserved[2];
144 144
145 if (verbose_mode) 145 if (verbose_mode)
146 fprintf(stderr, "Executing: program %s host %s, user %s, command %s\n", 146 fprintf(stderr,
147 ssh_program, host, remuser ? remuser : "(unspecified)", cmd); 147 "Executing: program %s host %s, user %s, command %s\n",
148 ssh_program, host,
149 remuser ? remuser : "(unspecified)", cmd);
148 150
149 /* 151 /*
150 * Reserve two descriptors so that the real pipes won't get 152 * Reserve two descriptors so that the real pipes won't get
@@ -830,7 +832,8 @@ bad: run_err("%s: %s", np, strerror(errno));
830 count += amt; 832 count += amt;
831 do { 833 do {
832 j = read(remin, cp, amt); 834 j = read(remin, cp, amt);
833 if (j == -1 && (errno == EINTR || errno == EAGAIN)) { 835 if (j == -1 && (errno == EINTR ||
836 errno == EAGAIN)) {
834 continue; 837 continue;
835 } else if (j <= 0) { 838 } else if (j <= 0) {
836 run_err("%s", j ? strerror(errno) : 839 run_err("%s", j ? strerror(errno) :