1 files changed, 28 insertions, 23 deletions

diff --git a/scp.c b/scp.c
index f69fd05fc..1407aa71d 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.119 2005/01/24 10:22:06 dtucker Exp $");
+RCSID("$OpenBSD: scp.c,v 1.125 2005/07/27 10:39:03 dtucker Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -109,11 +109,13 @@ static void
 killchild(int signo)
 {
         if (do_cmd_pid > 1) {
-                kill(do_cmd_pid, signo);
+                kill(do_cmd_pid, signo ? signo : SIGTERM);
                 waitpid(do_cmd_pid, NULL, 0);
         }
 
-        _exit(1);
+        if (signo)
+                _exit(1);
+        exit(1);
 }
 
 /*
@@ -184,7 +186,7 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
 }
 
 typedef struct {
-        int cnt;
+        size_t cnt;
         char *buf;
 } BUF;
 
@@ -361,20 +363,21 @@ void
 toremote(char *targ, int argc, char **argv)
 {
         int i, len;
-        char *bp, *host, *src, *suser, *thost, *tuser;
+        char *bp, *host, *src, *suser, *thost, *tuser, *arg;
 
         *targ++ = 0;
         if (*targ == 0)
                 targ = ".";
 
-        if ((thost = strrchr(argv[argc - 1], '@'))) {
+        arg = xstrdup(argv[argc - 1]);
+        if ((thost = strrchr(arg, '@'))) {
                 /* user@host */
                 *thost++ = 0;
-                tuser = argv[argc - 1];
+                tuser = arg;
                 if (*tuser == '\0')
                         tuser = NULL;
         } else {
-                thost = argv[argc - 1];
+                thost = arg;
                 tuser = NULL;
         }
 
@@ -501,8 +504,9 @@ source(int argc, char **argv)
         struct stat stb;
         static BUF buffer;
         BUF *bp;
-        off_t i, amt, result, statbytes;
-        int fd, haderr, indx;
+        off_t i, amt, statbytes;
+        size_t result;
+        int fd = -1, haderr, indx;
         char *last, *name, buf[2048];
         int len;
 
@@ -577,14 +581,14 @@ next:			(void) close(fd);
                         if (!haderr) {
                                 result = atomicio(read, fd, bp->buf, amt);
                                 if (result != amt)
-                                        haderr = result >= 0 ? EIO : errno;
+                                        haderr = errno;
                         }
                         if (haderr)
                                 (void) atomicio(vwrite, remout, bp->buf, amt);
                         else {
                                 result = atomicio(vwrite, remout, bp->buf, amt);
                                 if (result != amt)
-                                        haderr = result >= 0 ? EIO : errno;
+                                        haderr = errno;
                                 statbytes += result;
                         }
                         if (limit_rate)
@@ -719,8 +723,9 @@ sink(int argc, char **argv)
                 YES, NO, DISPLAYED
         } wrerr;
         BUF *bp;
-        off_t i, j;
-        int amt, count, exists, first, mask, mode, ofd, omode;
+        off_t i;
+        size_t j, count;
+        int amt, exists, first, mask, mode, ofd, omode;
         off_t size, statbytes;
         int setimes, targisdir, wrerrno = 0;
         char ch, *cp, *np, *targ, *why, *vect[1], buf[2048];
@@ -747,7 +752,7 @@ sink(int argc, char **argv)
                 targisdir = 1;
         for (first = 1;; first = 0) {
                 cp = buf;
-                if (atomicio(read, remin, cp, 1) <= 0)
+                if (atomicio(read, remin, cp, 1) != 1)
                         return;
                 if (*cp++ == '\n')
                         SCREWUP("unexpected <newline>");
@@ -828,7 +833,7 @@ sink(int argc, char **argv)
                 }
                 if (targisdir) {
                         static char *namebuf;
-                        static int cursize;
+                        static size_t cursize;
                         size_t need;
 
                         need = strlen(targ) + strlen(cp) + 250;
@@ -901,7 +906,7 @@ bad:			run_err("%s: %s", np, strerror(errno));
                         count += amt;
                         do {
                                 j = atomicio(read, remin, cp, amt);
-                                if (j <= 0) {
+                                if (j == 0) {
                                         run_err("%s", j ? strerror(errno) :
                                             "dropped connection");
                                         exit(1);
@@ -917,10 +922,10 @@ bad:			run_err("%s: %s", np, strerror(errno));
                         if (count == bp->cnt) {
                                 /* Keep reading so we stay sync'd up. */
                                 if (wrerr == NO) {
-                                        j = atomicio(vwrite, ofd, bp->buf, count);
-                                        if (j != count) {
+                                        if (atomicio(vwrite, ofd, bp->buf,
+                                            count) != count) {
                                                 wrerr = YES;
-                                                wrerrno = j >= 0 ? EIO : errno;
+                                                wrerrno = errno;
                                         }
                                 }
                                 count = 0;
@@ -930,9 +935,9 @@ bad:			run_err("%s: %s", np, strerror(errno));
                 if (showprogress)
                         stop_progress_meter();
                 if (count != 0 && wrerr == NO &&
-                    (j = atomicio(vwrite, ofd, bp->buf, count)) != count) {
+                    atomicio(vwrite, ofd, bp->buf, count) != count) {
                         wrerr = YES;
-                        wrerrno = j >= 0 ? EIO : errno;
+                        wrerrno = errno;
                 }
                 if (wrerr == NO && ftruncate(ofd, size) != 0) {
                         run_err("%s: truncate: %s", np, strerror(errno));
@@ -1069,7 +1074,7 @@ verifydir(char *cp)
                 errno = ENOTDIR;
         }
         run_err("%s: %s", cp, strerror(errno));
-        exit(1);
+        killchild(0);
 }
 
 int