don't use search path for rsh, hardwire it in; bug report 4.3BSD/bin/65

[unix-history] / usr / src / bin / rcp / rcp.c

diff --git a/usr/src/bin/rcp/rcp.c b/usr/src/bin/rcp/rcp.c
index e155b5a..bfa4ce7 100644 (file)
--- a/usr/src/bin/rcp/rcp.c
+++ b/usr/src/bin/rcp/rcp.c
@@ -1,12 +1,25 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif not lint
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)rcp.c      4.15 85/04/11";
-#endif
+static char sccsid[] = "@(#)rcp.c      5.5 (Berkeley) %G%";
+#endif not lint

 
 /*
  * rcp
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 
 /*
  * rcp
  */
 #include <sys/param.h>
 #include <sys/stat.h>

+#include <sys/time.h>

 #include <sys/ioctl.h>
 
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 
 #include <netinet/in.h>


@@ -22,17 +35,21 @@ int rem;
 char   *colon(), *index(), *rindex(), *malloc(), *strcpy(), *sprintf();
 int    errs;
 int    lostconn();
 char   *colon(), *index(), *rindex(), *malloc(), *strcpy(), *sprintf();
 int    errs;
 int    lostconn();

-int    iamremote;
-

 int    errno;
 char   *sys_errlist[];
 int    iamremote, targetshouldbedirectory;
 int    iamrecursive;
 int    errno;
 char   *sys_errlist[];
 int    iamremote, targetshouldbedirectory;
 int    iamrecursive;

+int    pflag;

 struct passwd *pwd;
 struct passwd *getpwuid();
 int    userid;
 int    port;
 
 struct passwd *pwd;
 struct passwd *getpwuid();
 int    userid;
 int    port;
 

+struct buffer {
+       int     cnt;
+       char    *buf;
+} *allocbuf();
+

 /*VARARGS*/
 int    error();
 
 /*VARARGS*/
 int    error();
 


@@ -59,36 +76,52 @@ main(argc, argv)
                fprintf(stderr, "who are you?\n");
                exit(1);
        }
                fprintf(stderr, "who are you?\n");
                exit(1);
        }

-       argc--, argv++;
-       if (argc > 0 && !strcmp(*argv, "-r")) {
-               iamrecursive++;
-               argc--, argv++;
-       }
-       if (argc > 0 && !strcmp(*argv, "-d")) {
-               targetshouldbedirectory = 1;
-               argc--, argv++;
-       }
-       if (argc > 0 && !strcmp(*argv, "-f")) {
-               argc--, argv++; iamremote = 1;
-               (void) response();
-               (void) setuid(userid);
-               source(argc, argv);
-               exit(errs);
-       }
-       if (argc > 0 && !strcmp(*argv, "-t")) {
-               argc--, argv++; iamremote = 1;
-               (void) setuid(userid);
-               sink(argc, argv);
-               exit(errs);
+
+       for (argc--, argv++; argc > 0 && **argv == '-'; argc--, argv++) {
+               (*argv)++;
+               while (**argv) switch (*(*argv)++) {
+
+                   case 'r':
+                       iamrecursive++;
+                       break;
+
+                   case 'p':           /* preserve mtimes and atimes */
+                       pflag++;
+                       break;
+
+                   /* The rest of these are not for users. */
+                   case 'd':
+                       targetshouldbedirectory = 1;
+                       break;
+
+                   case 'f':           /* "from" */
+                       iamremote = 1;
+                       (void) response();
+                       (void) setuid(userid);
+                       source(--argc, ++argv);
+                       exit(errs);
+
+                   case 't':           /* "to" */
+                       iamremote = 1;
+                       (void) setuid(userid);
+                       sink(--argc, ++argv);
+                       exit(errs);
+
+                   default:
+                       fprintf(stderr,
+               "Usage: rcp [-p] f1 f2; or: rcp [-rp] f1 ... fn d2\n");
+                       exit(1);
+               }

        }
        rem = -1;
        if (argc > 2)
                targetshouldbedirectory = 1;
        }
        rem = -1;
        if (argc > 2)
                targetshouldbedirectory = 1;

-       (void) sprintf(cmd, "rcp%s%s",
-           iamrecursive ? " -r" : "", targetshouldbedirectory ? " -d" : "");
-       signal(SIGPIPE, lostconn);
+       (void) sprintf(cmd, "rcp%s%s%s",
+           iamrecursive ? " -r" : "", pflag ? " -p" : "", 
+           targetshouldbedirectory ? " -d" : "");
+       (void) signal(SIGPIPE, lostconn);

        targ = colon(argv[argc - 1]);
        targ = colon(argv[argc - 1]);

-       if (targ) {
+       if (targ) {                             /* ... to remote */

                *targ++ = 0;
                if (*targ == 0)
                        targ = ".";
                *targ++ = 0;
                if (*targ == 0)
                        targ = ".";


@@ -97,16 +130,16 @@ main(argc, argv)
                        *thost++ = 0;
                        tuser = argv[argc - 1];
                        if (*tuser == '\0')
                        *thost++ = 0;
                        tuser = argv[argc - 1];
                        if (*tuser == '\0')

-                               tuser = pwd->pw_name;
+                               tuser = NULL;

                        else if (!okname(tuser))
                                exit(1);
                } else {
                        thost = argv[argc - 1];
                        else if (!okname(tuser))
                                exit(1);
                } else {
                        thost = argv[argc - 1];

-                       tuser = pwd->pw_name;
+                       tuser = NULL;

                }
                for (i = 0; i < argc - 1; i++) {
                        src = colon(argv[i]);
                }
                for (i = 0; i < argc - 1; i++) {
                        src = colon(argv[i]);

-                       if (src) {
+                       if (src) {              /* remote to remote */

                                *src++ = 0;
                                if (*src == 0)
                                        src = ".";
                                *src++ = 0;
                                if (*src == 0)
                                        src = ".";


@@ -118,20 +151,23 @@ main(argc, argv)
                                                suser = pwd->pw_name;
                                        else if (!okname(suser))
                                                continue;
                                                suser = pwd->pw_name;
                                        else if (!okname(suser))
                                                continue;

-               (void) sprintf(buf, "rsh %s -l %s -n %s %s '%s@%s:%s'",
-                                           host, suser, cmd, src,
-                                           tuser, thost, targ);
+               (void) sprintf(buf, "/usr/ucb/rsh %s -l %s -n %s %s '%s%s%s:%s'",
+                                           host, suser, cmd, src, tuser,
+                                           tuser ? "@" : "",
+                                           thost, targ);

                                } else
                                } else

-               (void) sprintf(buf, "rsh %s -n %s %s '%s@%s:%s'",
-                                           argv[i], cmd, src,
-                                           tuser, thost, targ);
+               (void) sprintf(buf, "/usr/ucb/rsh %s -n %s %s '%s%s%s:%s'",
+                                           argv[i], cmd, src, tuser,
+                                           tuser ? "@" : "",
+                                           thost, targ);

                                (void) susystem(buf);
                                (void) susystem(buf);

-                       } else {
+                       } else {                /* local to remote */

                                if (rem == -1) {
                                        (void) sprintf(buf, "%s -t %s",
                                            cmd, targ);
                                        host = thost;
                                if (rem == -1) {
                                        (void) sprintf(buf, "%s -t %s",
                                            cmd, targ);
                                        host = thost;

-                                       rem = rcmd(&host, port, pwd->pw_name, tuser,
+                                       rem = rcmd(&host, port, pwd->pw_name,
+                                           tuser ? tuser : pwd->pw_name,

                                            buf, 0);
                                        if (rem < 0)
                                                exit(1);
                                            buf, 0);
                                        if (rem < 0)
                                                exit(1);


@@ -142,17 +178,18 @@ main(argc, argv)
                                source(1, argv+i);
                        }
                }
                                source(1, argv+i);
                        }
                }

-       } else {
+       } else {                                /* ... to local */

                if (targetshouldbedirectory)
                        verifydir(argv[argc - 1]);
                for (i = 0; i < argc - 1; i++) {
                        src = colon(argv[i]);
                if (targetshouldbedirectory)
                        verifydir(argv[argc - 1]);
                for (i = 0; i < argc - 1; i++) {
                        src = colon(argv[i]);

-                       if (src == 0) {
-                               (void) sprintf(buf, "/bin/cp%s %s %s",
+                       if (src == 0) {         /* local to local */
+                               (void) sprintf(buf, "/bin/cp%s%s %s %s",

                                    iamrecursive ? " -r" : "",
                                    iamrecursive ? " -r" : "",

+                                   pflag ? " -p" : "",

                                    argv[i], argv[argc - 1]);
                                (void) susystem(buf);
                                    argv[i], argv[argc - 1]);
                                (void) susystem(buf);

-                       } else {
+                       } else {                /* remote to local */

                                *src++ = 0;
                                if (*src == 0)
                                        src = ".";
                                *src++ = 0;
                                if (*src == 0)
                                        src = ".";


@@ -240,7 +277,7 @@ susystem(s)
        register int (*istat)(), (*qstat)();
 
        if ((pid = vfork()) == 0) {
        register int (*istat)(), (*qstat)();
 
        if ((pid = vfork()) == 0) {

-               setuid(userid);
+               (void) setuid(userid);

                execl("/bin/sh", "sh", "-c", s, (char *)0);
                _exit(127);
        }
                execl("/bin/sh", "sh", "-c", s, (char *)0);
                _exit(127);
        }


@@ -250,8 +287,8 @@ susystem(s)
                ;
        if (w == -1)
                status = -1;
                ;
        if (w == -1)
                status = -1;

-       signal(SIGINT, istat);
-       signal(SIGQUIT, qstat);
+       (void) signal(SIGINT, istat);
+       (void) signal(SIGQUIT, qstat);

        return (status);
 }
 
        return (status);
 }
 


@@ -261,9 +298,11 @@ source(argc, argv)
 {
        char *last, *name;
        struct stat stb;
 {
        char *last, *name;
        struct stat stb;

-       char buf[BUFSIZ];
-       int x, sizerr, f;
+       static struct buffer buffer;
+       struct buffer *bp;
+       int x, sizerr, f, amt;

        off_t i;
        off_t i;

+       char buf[BUFSIZ];

 
        for (x = 0; x < argc; x++) {
                name = argv[x];
 
        for (x = 0; x < argc; x++) {
                name = argv[x];


@@ -281,7 +320,7 @@ source(argc, argv)
                case S_IFDIR:
                        if (iamrecursive) {
                                (void) close(f);
                case S_IFDIR:
                        if (iamrecursive) {
                                (void) close(f);

-                               rsource(name, (int)stb.st_mode);
+                               rsource(name, &stb);

                                continue;
                        }
                        /* fall into ... */
                                continue;
                        }
                        /* fall into ... */


@@ -296,21 +335,38 @@ notreg:
                        last = name;
                else
                        last++;
                        last = name;
                else
                        last++;

-               (void) sprintf(buf, "C%04o %D %s\n",
+               if (pflag) {
+                       /*
+                        * Make it compatible with possible future
+                        * versions expecting microseconds.
+                        */
+                       (void) sprintf(buf, "T%ld 0 %ld 0\n",
+                           stb.st_mtime, stb.st_atime);
+                       (void) write(rem, buf, strlen(buf));
+                       if (response() < 0) {
+                               (void) close(f);
+                               continue;
+                       }
+               }
+               (void) sprintf(buf, "C%04o %ld %s\n",

                    stb.st_mode&07777, stb.st_size, last);
                (void) write(rem, buf, strlen(buf));
                if (response() < 0) {
                        (void) close(f);
                        continue;
                }
                    stb.st_mode&07777, stb.st_size, last);
                (void) write(rem, buf, strlen(buf));
                if (response() < 0) {
                        (void) close(f);
                        continue;
                }

+               if ((bp = allocbuf(&buffer, f, BUFSIZ)) < 0) {
+                       (void) close(f);
+                       continue;
+               }

                sizerr = 0;
                sizerr = 0;

-               for (i = 0; i < stb.st_size; i += BUFSIZ) {
-                       int amt = BUFSIZ;
+               for (i = 0; i < stb.st_size; i += bp->cnt) {
+                       amt = bp->cnt;

                        if (i + amt > stb.st_size)
                                amt = stb.st_size - i;
                        if (i + amt > stb.st_size)
                                amt = stb.st_size - i;

-                       if (sizerr == 0 && read(f, buf, amt) != amt)
+                       if (sizerr == 0 && read(f, bp->buf, amt) != amt)

                                sizerr = 1;
                                sizerr = 1;

-                       (void) write(rem, buf, amt);
+                       (void) write(rem, bp->buf, amt);

                }
                (void) close(f);
                if (sizerr == 0)
                }
                (void) close(f);
                if (sizerr == 0)


@@ -323,9 +379,9 @@ notreg:
 
 #include <sys/dir.h>
 
 
 #include <sys/dir.h>
 

-rsource(name, mode)
+rsource(name, statp)

        char *name;
        char *name;

-       int mode;
+       struct stat *statp;

 {
        DIR *d = opendir(name);
        char *last;
 {
        DIR *d = opendir(name);
        char *last;


@@ -342,7 +398,16 @@ rsource(name, mode)
                last = name;
        else
                last++;
                last = name;
        else
                last++;

-       (void) sprintf(buf, "D%04o %d %s\n", mode&07777, 0, last);
+       if (pflag) {
+               (void) sprintf(buf, "T%ld 0 %ld 0\n",
+                   statp->st_mtime, statp->st_atime);
+               (void) write(rem, buf, strlen(buf));
+               if (response() < 0) {
+                       closedir(d);
+                       return;
+               }
+       }
+       (void) sprintf(buf, "D%04o %d %s\n", statp->st_mode&07777, 0, last);

        (void) write(rem, buf, strlen(buf));
        if (response() < 0) {
                closedir(d);
        (void) write(rem, buf, strlen(buf));
        if (response() < 0) {
                closedir(d);


@@ -374,14 +439,14 @@ response()
                lostconn();
        switch (resp) {
 
                lostconn();
        switch (resp) {
 

-       case 0:
+       case 0:                         /* ok */

                return (0);
 
        default:
                *cp++ = resp;
                /* fall into... */
                return (0);
 
        default:
                *cp++ = resp;
                /* fall into... */

-       case 1:
-       case 2:
+       case 1:                         /* error, followed by err msg */
+       case 2:                         /* fatal error, "" */

                do {
                        if (read(rem, &c, 1) != 1)
                                lostconn();
                do {
                        if (read(rem, &c, 1) != 1)
                                lostconn();


@@ -409,17 +474,24 @@ sink(argc, argv)
        int argc;
        char **argv;
 {
        int argc;
        char **argv;
 {

-       char *targ;
-       char cmdbuf[BUFSIZ], nambuf[BUFSIZ], buf[BUFSIZ], *cp;
-       int of, mode, wrerr, exists, first;
-       off_t i, size;
-       char *whopp;
-       struct stat stb; int targisdir = 0;
-#define        SCREWUP(str)    { whopp = str; goto screwup; }
+       off_t i, j;
+       char *targ, *whopp, *cp;
+       int of, mode, wrerr, exists, first, count, amt, size;
+       struct buffer *bp;
+       static struct buffer buffer;
+       struct stat stb;
+       int targisdir = 0;

        int mask = umask(0);
        char *myargv[1];
        int mask = umask(0);
        char *myargv[1];

+       char cmdbuf[BUFSIZ], nambuf[BUFSIZ];
+       int setimes = 0;
+       struct timeval tv[2];
+#define atime  tv[0]
+#define mtime  tv[1]
+#define        SCREWUP(str)    { whopp = str; goto screwup; }

 
 

-       umask(mask);
+       if (!pflag)
+               (void) umask(mask);

        if (argc != 1) {
                error("rcp: ambiguous target\n");
                exit(1);
        if (argc != 1) {
                error("rcp: ambiguous target\n");
                exit(1);


@@ -455,6 +527,26 @@ sink(argc, argv)
                        ga();
                        return;
                }
                        ga();
                        return;
                }

+
+#define getnum(t) (t) = 0; while (isdigit(*cp)) (t) = (t) * 10 + (*cp++ - '0');
+               if (*cp == 'T') {
+                       setimes++;
+                       cp++;
+                       getnum(mtime.tv_sec);
+                       if (*cp++ != ' ')
+                               SCREWUP("mtime.sec not delimited");
+                       getnum(mtime.tv_usec);
+                       if (*cp++ != ' ')
+                               SCREWUP("mtime.usec not delimited");
+                       getnum(atime.tv_sec);
+                       if (*cp++ != ' ')
+                               SCREWUP("atime.sec not delimited");
+                       getnum(atime.tv_usec);
+                       if (*cp++ != '\0')
+                               SCREWUP("atime.usec not delimited");
+                       ga();
+                       continue;
+               }

                if (*cp != 'C' && *cp != 'D') {
                        /*
                         * Check for the case "rcp remote:foo\* local:bar".
                if (*cp != 'C' && *cp != 'D') {
                        /*
                         * Check for the case "rcp remote:foo\* local:bar".


@@ -479,7 +571,7 @@ sink(argc, argv)
                if (*cp++ != ' ')
                        SCREWUP("mode not delimited");
                size = 0;
                if (*cp++ != ' ')
                        SCREWUP("mode not delimited");
                size = 0;

-               while (*cp >= '0' && *cp <= '9')
+               while (isdigit(*cp))

                        size = size * 10 + (*cp++ - '0');
                if (*cp++ != ' ')
                        SCREWUP("size not delimited");
                        size = size * 10 + (*cp++ - '0');
                if (*cp++ != ' ')
                        SCREWUP("size not delimited");


@@ -495,10 +587,18 @@ sink(argc, argv)
                                        errno = ENOTDIR;
                                        goto bad;
                                }
                                        errno = ENOTDIR;
                                        goto bad;
                                }

+                               if (pflag)
+                                       (void) chmod(nambuf, mode);

                        } else if (mkdir(nambuf, mode) < 0)
                                goto bad;
                        myargv[0] = nambuf;
                        sink(1, myargv);
                        } else if (mkdir(nambuf, mode) < 0)
                                goto bad;
                        myargv[0] = nambuf;
                        sink(1, myargv);

+                       if (setimes) {
+                               setimes = 0;
+                               if (utimes(nambuf, tv) < 0)
+                                       error("rcp: can't set times on %s: %s\n",
+                                           nambuf, sys_errlist[errno]);
+                       }

                        continue;
                }
                if ((of = creat(nambuf, mode)) < 0) {
                        continue;
                }
                if ((of = creat(nambuf, mode)) < 0) {


@@ -506,34 +606,55 @@ sink(argc, argv)
                        error("rcp: %s: %s\n", nambuf, sys_errlist[errno]);
                        continue;
                }
                        error("rcp: %s: %s\n", nambuf, sys_errlist[errno]);
                        continue;
                }

-               if (exists)
-                       (void) fchmod(of, mode &~ mask);
+               if (exists && pflag)
+                       (void) fchmod(of, mode);

                ga();
                ga();

+               if ((bp = allocbuf(&buffer, of, BUFSIZ)) < 0) {
+                       (void) close(of);
+                       continue;
+               }
+               cp = bp->buf;
+               count = 0;

                wrerr = 0;
                for (i = 0; i < size; i += BUFSIZ) {
                wrerr = 0;
                for (i = 0; i < size; i += BUFSIZ) {

-                       int amt = BUFSIZ;
-                       char *cp = buf;
-
+                       amt = BUFSIZ;

                        if (i + amt > size)
                                amt = size - i;
                        if (i + amt > size)
                                amt = size - i;

+                       count += amt;

                        do {
                        do {

-                               int j = read(rem, cp, amt);
-
-                               if (j <= 0)
+                               j = read(rem, cp, amt);
+                               if (j <= 0) {
+                                       if (j == 0)
+                                           error("rcp: dropped connection");
+                                       else
+                                           error("rcp: %s\n",
+                                               sys_errlist[errno]);

                                        exit(1);
                                        exit(1);

+                               }

                                amt -= j;
                                cp += j;
                        } while (amt > 0);
                                amt -= j;
                                cp += j;
                        } while (amt > 0);

-                       amt = BUFSIZ;
-                       if (i + amt > size)
-                               amt = size - i;
-                       if (wrerr == 0 && write(of, buf, amt) != amt)
-                               wrerr++;
+                       if (count == bp->cnt) {
+                               if (wrerr == 0 &&
+                                   write(of, bp->buf, count) != count)
+                                       wrerr++;
+                               count = 0;
+                               cp = bp->buf;
+                       }

                }
                }

+               if (count != 0 && wrerr == 0 &&
+                   write(of, bp->buf, count) != count)
+                       wrerr++;

                (void) close(of);
                (void) response();
                (void) close(of);
                (void) response();

+               if (setimes) {
+                       setimes = 0;
+                       if (utimes(nambuf, tv) < 0)
+                               error("rcp: can't set times on %s: %s\n",
+                                   nambuf, sys_errlist[errno]);
+               }                                  

                if (wrerr)
                if (wrerr)

-                       error("rcp: %s: %s\n", cp, sys_errlist[errno]);
+                       error("rcp: %s: %s\n", nambuf, sys_errlist[errno]);

                else
                        ga();
        }
                else
                        ga();
        }


@@ -542,7 +663,35 @@ screwup:
        exit(1);
 }
 
        exit(1);
 }
 

-/*VARARGS*/
+struct buffer *
+allocbuf(bp, fd, blksize)
+       struct buffer *bp;
+       int fd, blksize;
+{
+       struct stat stb;
+       int size;
+
+       if (fstat(fd, &stb) < 0) {
+               error("rcp: fstat: %s\n", sys_errlist[errno]);
+               return ((struct buffer *)-1);
+       }
+       size = roundup(stb.st_blksize, blksize);
+       if (size == 0)
+               size = blksize;
+       if (bp->cnt < size) {
+               if (bp->buf != 0)
+                       free(bp->buf);
+               bp->buf = (char *)malloc((unsigned) size);
+               if (bp->buf == 0) {
+                       error("rcp: malloc: out of memory\n");
+                       return ((struct buffer *)-1);
+               }
+       }
+       bp->cnt = size;
+       return (bp);
+}
+
+/*VARARGS1*/

 error(fmt, a1, a2, a3, a4, a5)
        char *fmt;
        int a1, a2, a3, a4, a5;
 error(fmt, a1, a2, a3, a4, a5)
        char *fmt;
        int a1, a2, a3, a4, a5;