- djm@cvs.openbsd.org 2001/12/21 10:06:43

[openssh.git] / scp.c

diff --git a/scp.c b/scp.c
index b18e7323c059b1a3d2c3870f909a8829eaf424e1..d285f9f55ff1f0e3ee2fbd355e57b77ab9d015ac 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.72 2001/06/03 19:38:42 markus Exp $");
+RCSID("$OpenBSD: scp.c,v 1.86 2001/12/05 03:56:39 itojun Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -91,6 +91,8 @@ char *__progname;
 
 /* For progressmeter() -- number of seconds before xfer considered "stalled" */
 #define STALLTIME      5
+/* alarm() interval for updating progress meter */
+#define PROGRESSTIME   1
 
 /* Progress meter bar */
 #define BAR \
@@ -143,8 +145,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
@@ -233,10 +237,12 @@ main(argc, argv)
        args.list = NULL;
        addargs(&args, "ssh");          /* overwritten with ssh_program */
        addargs(&args, "-x");
+       addargs(&args, "-oForwardAgent no");
        addargs(&args, "-oFallBackToRsh no");
+       addargs(&args, "-oClearAllForwardings yes");
 
        fflag = tflag = 0;
-       while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != -1)
+       while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1)
                switch (ch) {
                /* User-visible flags. */
                case '4':
@@ -247,6 +253,7 @@ main(argc, argv)
                case 'o':
                case 'c':
                case 'i':
+               case 'F':
                        addargs(&args, "-%c%s", ch, optarg);
                        break;
                case 'P':
@@ -365,13 +372,17 @@ toremote(targ, argc, argv)
        for (i = 0; i < argc - 1; i++) {
                src = colon(argv[i]);
                if (src) {      /* remote to remote */
+                       static char *ssh_options =
+                           "-x -o'FallBackToRsh no' "
+                           "-o'ClearAllForwardings yes'";
                        *src++ = 0;
                        if (*src == 0)
                                src = ".";
                        host = strchr(argv[i], '@');
                        len = strlen(ssh_program) + strlen(argv[i]) +
                            strlen(src) + (tuser ? strlen(tuser) : 0) +
-                           strlen(thost) + strlen(targ) + CMDNEEDS + 32;
+                           strlen(thost) + strlen(targ) +
+                           strlen(ssh_options) + CMDNEEDS + 20;
                        bp = xmalloc(len);
                        if (host) {
                                *host++ = 0;
@@ -382,19 +393,19 @@ toremote(targ, argc, argv)
                                else if (!okname(suser))
                                        continue;
                                snprintf(bp, len,
-                                   "%s%s -x -o'FallBackToRsh no' -n "
+                                   "%s%s %s -n "
                                    "-l %s %s %s %s '%s%s%s:%s'",
                                    ssh_program, verbose_mode ? " -v" : "",
-                                   suser, host, cmd, src,
+                                   ssh_options, suser, host, cmd, src,
                                    tuser ? tuser : "", tuser ? "@" : "",
                                    thost, targ);
                        } else {
                                host = cleanhostname(argv[i]);
                                snprintf(bp, len,
-                                   "exec %s%s -x -o'FallBackToRsh no' -n %s "
+                                   "exec %s%s %s -n %s "
                                    "%s %s '%s%s%s:%s'",
                                    ssh_program, verbose_mode ? " -v" : "",
-                                   host, cmd, src,
+                                   ssh_options, host, cmd, src,
                                    tuser ? tuser : "", tuser ? "@" : "",
                                    thost, targ);
                        }
@@ -492,6 +503,11 @@ source(argc, argv)
                len = strlen(name);
                while (len > 1 && name[len-1] == '/')
                        name[--len] = '\0';
+               if (strchr(name, '\n') != NULL) {
+                       run_err("%s: skipping, filename contains a newline",
+                           name);
+                       goto next;
+               }
                if ((fd = open(name, O_RDONLY, 0)) < 0)
                        goto syserr;
                if (fstat(fd, &stb) < 0) {
@@ -662,7 +678,7 @@ sink(argc, argv)
 
 #define        atime   tv[0]
 #define        mtime   tv[1]
-#define        SCREWUP(str)    { why = str; goto screwup; }
+#define        SCREWUP(str)    do { why = str; goto screwup; } while (0)
 
        setimes = targisdir = 0;
        mask = umask(0);
@@ -829,7 +845,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) :
@@ -913,7 +930,7 @@ screwup:
 }
 
 int
-response()
+response(void)
 {
        char ch, *cp, resp, rbuf[2048];
 
@@ -946,10 +963,11 @@ response()
 }
 
 void
-usage()
+usage(void)
 {
-       (void) fprintf(stderr, "usage: scp "
-           "[-pqrvBC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2\n"
+       (void) fprintf(stderr,
+           "usage: scp [-pqrvBC46] [-F config] [-S ssh] [-P port] [-c cipher] [-i identity]\n"
+           "           [-o option] f1 f2\n"
            "   or: scp [options] f1 ... fn directory\n");
        exit(1);
 }
@@ -1003,7 +1021,7 @@ okname(cp0)
 
        cp = cp0;
        do {
-               c = *cp;
+               c = (int)*cp;
                if (c & 0200)
                        goto bad;
                if (!isalpha(c) && !isdigit(c) &&
@@ -1022,7 +1040,7 @@ allocbuf(bp, fd, blksize)
        int fd, blksize;
 {
        size_t size;
-#ifdef HAVE_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
        struct stat stb;
 
        if (fstat(fd, &stb) < 0) {
@@ -1034,15 +1052,16 @@ allocbuf(bp, fd, blksize)
        else
                size = blksize + (stb.st_blksize - blksize % stb.st_blksize) %
                    stb.st_blksize;
-#else /* HAVE_ST_BLKSIZE */
+#else /* HAVE_STRUCT_STAT_ST_BLKSIZE */
        size = blksize;
-#endif /* HAVE_ST_BLKSIZE */
+#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */
        if (bp->cnt >= size)
                return (bp);
        if (bp->buf == NULL)
                bp->buf = xmalloc(size);
        else
                bp->buf = xrealloc(bp->buf, size);
+       memset(bp->buf, 0, size);
        bp->cnt = size;
        return (bp);
 }
@@ -1052,32 +1071,25 @@ lostconn(signo)
        int signo;
 {
        if (!iamremote)
-               fprintf(stderr, "lost connection\n");
-       exit(1);
-}
-
-
-void
-alarmtimer(int wait)
-{
-       struct itimerval itv;
-
-       itv.it_value.tv_sec = wait;
-       itv.it_value.tv_usec = 0;
-       itv.it_interval = itv.it_value;
-       setitimer(ITIMER_REAL, &itv, NULL);
+               write(STDERR_FILENO, "lost connection\n", 16);
+       if (signo)
+               _exit(1);
+       else
+               exit(1);
 }
 
-void
+static void
 updateprogressmeter(int ignore)
 {
        int save_errno = errno;
 
        progressmeter(0);
+       signal(SIGALRM, updateprogressmeter);
+       alarm(PROGRESSTIME);
        errno = save_errno;
 }
 
-int
+static int
 foregroundproc(void)
 {
        static pid_t pgrp = -1;
@@ -1186,9 +1198,9 @@ progressmeter(int flag)
 
        if (flag == -1) {
                mysignal(SIGALRM, updateprogressmeter);
-               alarmtimer(1);
+               alarm(PROGRESSTIME);
        } else if (flag == 1) {
-               alarmtimer(0);
+               alarm(0);
                atomicio(write, fileno(stdout), "\n", 1);
                statbytes = 0;
        }