BSD 4_3_Net_2 release

[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 4f77f8d..a8984b2 100644 (file)
--- a/usr/src/bin/rcp/rcp.c
+++ b/usr/src/bin/rcp/rcp.c
@@ -1,132 +1,140 @@
 /*
 /*

- * Copyright (c) 1983 The Regents of the University of California.
+ * Copyright (c) 1983, 1990 The Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1983 The Regents of the University of California.\n\
+"@(#) Copyright (c) 1983, 1990 The Regents of the University of California.\n\

  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)rcp.c      5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)rcp.c      5.32.1.1 (Berkeley) 8/20/91";

 #endif /* not lint */
 
 /*
  * rcp
  */
 #include <sys/param.h>
 #endif /* not lint */
 
 /*
  * rcp
  */
 #include <sys/param.h>

-#include <sys/file.h>

 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>

-#include <sys/dir.h>
-#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/wait.h>

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

+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <signal.h>

 #include <pwd.h>
 #include <netdb.h>
 #include <errno.h>
 #include <pwd.h>
 #include <netdb.h>
 #include <errno.h>

-#include <strings.h>
+#include <unistd.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 #include <ctype.h>
 #include "pathnames.h"
 
 #ifdef KERBEROS
 #include <ctype.h>
 #include "pathnames.h"
 
 #ifdef KERBEROS

-#include <kerberos/krb.h>
-
-char krb_realm[REALM_SZ];
-int use_kerberos = 1, encrypt = 0;
-CREDENTIALS cred;
-Key_schedule schedule;
+#include <kerberosIV/des.h>
+#include <kerberosIV/krb.h>
+char   dst_realm_buf[REALM_SZ];
+char   *dest_realm = NULL;
+int    use_kerberos = 1;
+CREDENTIALS    cred;
+Key_schedule   schedule;
+extern char    *krb_realmofhost();
+#define        OPTIONS "dfk:prt"
+#else
+#define        OPTIONS "dfprt"

 #endif
 
 #endif
 

-extern int errno;
-extern char *sys_errlist[];

 struct passwd *pwd;
 struct passwd *pwd;

-int errs, pflag, port, rem, userid;
-int iamremote, iamrecursive, targetshouldbedirectory;
+u_short        port;
+uid_t  userid;
+int errs, rem;
+int pflag, iamremote, iamrecursive, targetshouldbedirectory;

 
 

-char cmd[20];                  /* must hold "rcp -r -p -d\0" */
+#define        CMDNEEDS        64
+char cmd[CMDNEEDS];            /* must hold "rcp -r -p -d\0" */

 
 typedef struct _buf {
        int     cnt;
        char    *buf;
 } BUF;
 
 
 typedef struct _buf {
        int     cnt;
        char    *buf;
 } BUF;
 

+void lostconn();
+

 main(argc, argv)
        int argc;
        char **argv;
 {
        extern int optind;
 main(argc, argv)
        int argc;
        char **argv;
 {
        extern int optind;

+       extern char *optarg;

        struct servent *sp;
        int ch, fflag, tflag;
        struct servent *sp;
        int ch, fflag, tflag;

-       char *targ, *colon();
-       struct passwd *getpwuid();
-       int lostconn();
-
-#ifdef KERBEROS
-       sp = getservbyname("kshell", "tcp");
-       if (sp == NULL) {
-               use_kerberos = 0;
-               old_warning("kshell service unknown");
-               sp = getservbyname("kshell", "tcp");
-       }
-#else
-       sp = getservbyname("shell", "tcp");
-#endif
-       if (!sp) {
-               (void)fprintf(stderr, "rcp: shell/tcp: unknown service\n");
-               exit(1);
-       }
-       port = sp->s_port;
-
-       if (!(pwd = getpwuid(userid = getuid()))) {
-               (void)fprintf(stderr, "rcp: unknown user %d.\n", userid);
-               exit(1);
-       }
+       char *targ, *shell, *colon();

 
        fflag = tflag = 0;
 
        fflag = tflag = 0;

-       while ((ch = getopt(argc, argv, "dfkprtx")) != EOF)
+       while ((ch = getopt(argc, argv, OPTIONS)) != EOF)

                switch(ch) {
                switch(ch) {

-               case 'd':
-                       targetshouldbedirectory = 1;
+               /* user-visible flags */
+               case 'p':                       /* preserve access/mod times */
+                       ++pflag;

                        break;
                        break;

-               case 'f':                       /* "from" */
-                       fflag = 1;
+               case 'r':
+                       ++iamrecursive;

                        break;
                        break;

-#ifdef KERBEROS
+#ifdef KERBEROS

                case 'k':
                case 'k':

-                       strncpy(krb_realm, ++argv, REALM_SZ);
+                       strncpy(dst_realm_buf, optarg, REALM_SZ);
+                       dest_realm = dst_realm_buf;

                        break;
 #endif
                        break;
 #endif

-               case 'p':                       /* preserve access/mod times */
-                       ++pflag;
+               /* rshd-invoked options (server) */
+               case 'd':
+                       targetshouldbedirectory = 1;

                        break;
                        break;

-               case 'r':
-                       ++iamrecursive;
+               case 'f':                       /* "from" */
+                       iamremote = 1;
+                       fflag = 1;

                        break;
                case 't':                       /* "to" */
                        break;
                case 't':                       /* "to" */

+                       iamremote = 1;

                        tflag = 1;
                        break;
                        tflag = 1;
                        break;

-#ifdef KERBEROS
-               case 'x':
-                       encrypt = 1;
-                       des_set_key(cred.session, schedule);
-                       break;
-#endif
+

                case '?':
                default:
                        usage();
                case '?':
                default:
                        usage();


@@ -134,8 +142,33 @@ main(argc, argv)
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

+#ifdef KERBEROS
+       shell = "kshell";
+       sp = getservbyname(shell, "tcp");
+       if (sp == NULL) {
+               char    msgbuf[64];
+               use_kerberos = 0;
+               (void)snprintf(msgbuf, sizeof(msgbuf),
+                   "can't get entry for %s/tcp service", shell);
+               old_warning(msgbuf);
+               sp = getservbyname(shell = "shell", "tcp");
+       }
+#else
+       sp = getservbyname(shell = "shell", "tcp");
+#endif
+       if (sp == NULL) {
+               (void)fprintf(stderr, "rcp: %s/tcp: unknown service\n", shell);
+               exit(1);
+       }
+       port = sp->s_port;
+
+       if (!(pwd = getpwuid(userid = getuid()))) {
+               (void)fprintf(stderr, "rcp: unknown user %d.\n", (int)userid);
+               exit(1);
+       }
+

        if (fflag) {
        if (fflag) {

-               iamremote = 1;
+               /* follow "protocol", send data */

                (void)response();
                (void)setuid(userid);
                source(argc, argv);
                (void)response();
                (void)setuid(userid);
                source(argc, argv);


@@ -143,7 +176,7 @@ main(argc, argv)
        }
 
        if (tflag) {
        }
 
        if (tflag) {

-               iamremote = 1;
+               /* receive data */

                (void)setuid(userid);
                sink(argc, argv);
                exit(errs);
                (void)setuid(userid);
                sink(argc, argv);
                exit(errs);


@@ -155,15 +188,24 @@ main(argc, argv)
                targetshouldbedirectory = 1;
 
        rem = -1;
                targetshouldbedirectory = 1;
 
        rem = -1;

-       (void)sprintf(cmd, "rcp%s%s%s", iamrecursive ? " -r" : "",
+       /* command to be executed on remote system using "rsh" */
+#ifdef KERBEROS
+       (void)snprintf(cmd, sizeof(cmd),
+           "rcp%s%s%s%s", iamrecursive ? " -r" : "",
+           "",

            pflag ? " -p" : "", targetshouldbedirectory ? " -d" : "");
            pflag ? " -p" : "", targetshouldbedirectory ? " -d" : "");

+#else
+       (void)snprintf(cmd, sizeof(cmd), "rcp%s%s%s",
+           iamrecursive ? " -r" : "", pflag ? " -p" : "",
+           targetshouldbedirectory ? " -d" : "");
+#endif

 
        (void)signal(SIGPIPE, lostconn);
 
        if (targ = colon(argv[argc - 1]))
 
        (void)signal(SIGPIPE, lostconn);
 
        if (targ = colon(argv[argc - 1]))

-               toremote(targ, argc, argv);
+               toremote(targ, argc, argv);     /* destination is remote host */

        else {
        else {

-               tolocal(argc, argv);
+               tolocal(argc, argv);            /* destination is local host */

                if (targetshouldbedirectory)
                        verifydir(argv[argc - 1]);
        }
                if (targetshouldbedirectory)
                        verifydir(argv[argc - 1]);
        }


@@ -175,16 +217,16 @@ toremote(targ, argc, argv)
        int argc;
        char **argv;
 {
        int argc;
        char **argv;
 {

-       int i;
-       char *host, *src, *suser, *thost, *tuser;
-       char buf[1024], *colon();
+       int i, len, tos;
+       char *bp, *host, *src, *suser, *thost, *tuser;
+       char *colon();

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

-       thost = index(argv[argc - 1], '@');
-       if (thost) {
+       if (thost = index(argv[argc - 1], '@')) {
+               /* user@host */

                *thost++ = 0;
                tuser = argv[argc - 1];
                if (*tuser == '\0')
                *thost++ = 0;
                tuser = argv[argc - 1];
                if (*tuser == '\0')


@@ -203,6 +245,11 @@ toremote(targ, argc, argv)
                        if (*src == 0)
                                src = ".";
                        host = index(argv[i], '@');
                        if (*src == 0)
                                src = ".";
                        host = index(argv[i], '@');

+                       len = strlen(_PATH_RSH) + strlen(argv[i]) +
+                           strlen(src) + (tuser ? strlen(tuser) : 0) +
+                           strlen(thost) + strlen(targ) + CMDNEEDS + 20;
+                       if (!(bp = malloc(len)))
+                               nospace();

                        if (host) {
                                *host++ = 0;
                                suser = argv[i];
                        if (host) {
                                *host++ = 0;
                                suser = argv[i];


@@ -210,35 +257,45 @@ toremote(targ, argc, argv)
                                        suser = pwd->pw_name;
                                else if (!okname(suser))
                                        continue;
                                        suser = pwd->pw_name;
                                else if (!okname(suser))
                                        continue;

-                               (void)sprintf(buf,
+                               (void)snprintf(bp, len,

                                    "%s %s -l %s -n %s %s '%s%s%s:%s'",
                                    _PATH_RSH, host, suser, cmd, src,
                                    tuser ? tuser : "", tuser ? "@" : "",
                                    thost, targ);
                        } else
                                    "%s %s -l %s -n %s %s '%s%s%s:%s'",
                                    _PATH_RSH, host, suser, cmd, src,
                                    tuser ? tuser : "", tuser ? "@" : "",
                                    thost, targ);
                        } else

-                               (void)sprintf(buf,
+                               (void)snprintf(bp, len,

                                    "%s %s -n %s %s '%s%s%s:%s'",
                                    _PATH_RSH, argv[i], cmd, src,
                                    tuser ? tuser : "", tuser ? "@" : "",
                                    thost, targ);
                                    "%s %s -n %s %s '%s%s%s:%s'",
                                    _PATH_RSH, argv[i], cmd, src,
                                    tuser ? tuser : "", tuser ? "@" : "",
                                    thost, targ);

-                       (void)susystem(buf);
+                       (void)susystem(bp);
+                       (void)free(bp);

                } else {                        /* local to remote */
                        if (rem == -1) {
                } else {                        /* local to remote */
                        if (rem == -1) {

-                               (void)sprintf(buf, "%s -t %s", cmd, targ);
+                               len = strlen(targ) + CMDNEEDS + 20;
+                               if (!(bp = malloc(len)))
+                                       nospace();
+                               (void)snprintf(bp, len, "%s -t %s", cmd, targ);

                                host = thost;
 #ifdef KERBEROS
                                if (use_kerberos)
                                host = thost;
 #ifdef KERBEROS
                                if (use_kerberos)

-                                       kerberos(buf, tuser ?
-                                           tuser : pwd->pw_name);
+                                       rem = kerberos(&host, bp,
+                                           pwd->pw_name,
+                                           tuser ? tuser : pwd->pw_name);

                                else
 #endif
                                        rem = rcmd(&host, port, pwd->pw_name,
                                            tuser ? tuser : pwd->pw_name,
                                else
 #endif
                                        rem = rcmd(&host, port, pwd->pw_name,
                                            tuser ? tuser : pwd->pw_name,

-                                           buf, 0);
+                                           bp, 0);

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

+                               tos = IPTOS_THROUGHPUT;
+                               if (setsockopt(rem, IPPROTO_IP, IP_TOS,
+                                   (char *)&tos, sizeof(int)) < 0)
+                                       perror("rcp: setsockopt TOS (ignored)");

                                if (response() < 0)
                                        exit(1);
                                if (response() < 0)
                                        exit(1);

+                               (void)free(bp);

                                (void)setuid(userid);
                        }
                        source(1, argv+i);
                                (void)setuid(userid);
                        }
                        source(1, argv+i);


@@ -250,87 +307,62 @@ tolocal(argc, argv)
        int argc;
        char **argv;
 {
        int argc;
        char **argv;
 {

-       int i;
-       char *host, *src, *suser;
-       char buf[1024], *colon();
+       int i, len, tos;
+       char *bp, *host, *src, *suser;
+       char *colon();

 
        for (i = 0; i < argc - 1; i++) {
 
        for (i = 0; i < argc - 1; i++) {

-               src = colon(argv[i]);
-               if (src == 0) {                 /* local to local */
-                       (void)sprintf(buf, "%s%s%s %s %s",
-                           _PATH_CP, iamrecursive ? " -r" : "",
-                           pflag ? " -p" : "", argv[i], argv[argc - 1]);
-                       (void)susystem(buf);
-               } else {                        /* remote to local */
-                       *src++ = 0;
-                       if (*src == 0)
-                               src = ".";
-                       host = index(argv[i], '@');
-                       if (host) {
-                               *host++ = 0;
-                               suser = argv[i];
-                               if (*suser == '\0')
-                                       suser = pwd->pw_name;
-                               else if (!okname(suser))
-                                       continue;
-                       } else {
-                               host = argv[i];
+               if (!(src = colon(argv[i]))) {  /* local to local */
+                       len = strlen(_PATH_CP) + strlen(argv[i]) +
+                           strlen(argv[argc - 1]) + 20;
+                       if (!(bp = malloc(len)))
+                               nospace();
+                       (void)snprintf(bp, len, "%s%s%s %s %s", _PATH_CP,
+                           iamrecursive ? " -r" : "", pflag ? " -p" : "",
+                           argv[i], argv[argc - 1]);
+                       (void)susystem(bp);
+                       (void)free(bp);
+                       continue;
+               }
+               *src++ = 0;
+               if (*src == 0)
+                       src = ".";
+               host = index(argv[i], '@');
+               if (host) {
+                       *host++ = 0;
+                       suser = argv[i];
+                       if (*suser == '\0')

                                suser = pwd->pw_name;
                                suser = pwd->pw_name;

-                       }
-                       (void)sprintf(buf, "%s -f %s", cmd, src);
-#ifdef KERBEROS
-                       if (use_kerberos)
-                               kerberos(buf, suser);
-                       else
-#endif
-                               rem = rcmd(&host, port, pwd->pw_name, suser,
-                                   buf, 0);
-                       if (rem < 0)
+                       else if (!okname(suser))

                                continue;
                                continue;

-                       (void)setreuid(0, userid);
-                       sink(1, argv + argc - 1);
-                       (void)setreuid(userid, 0);
-                       (void)close(rem);
-                       rem = -1;
+               } else {
+                       host = argv[i];
+                       suser = pwd->pw_name;

                }
                }

-       }
-}
-
+               len = strlen(src) + CMDNEEDS + 20;
+               if (!(bp = malloc(len)))
+                       nospace();
+               (void)snprintf(bp, len, "%s -f %s", cmd, src);

 #ifdef KERBEROS
 #ifdef KERBEROS

-kerberos(buf, user)
-       char *buf, *user;
-{
-       struct servent *sp;
-       char *host;
-
-again: rem = KSUCCESS;
-       if (krb_realm[0] == '\0')
-               rem = krb_get_lrealm(krb_realm, 1);
-       if (rem == KSUCCESS) {
-               if (encrypt)
-                       rem = krcmd_mutual(&host, port, user, buf,
-                           0, krb_realm, &cred, schedule);
+               if (use_kerberos)
+                       rem = kerberos(&host, bp, pwd->pw_name, suser);

                else
                else

-                       rem = krcmd(&host, port, user, buf, 0, krb_realm);
-       } else {
-               (void)fprintf(stderr,
-                   "rcp: error getting local realm %s\n", krb_err_txt[rem]);
-               exit(1);
-       }
-       if (rem < 0 && errno == ECONNREFUSED) {
-               use_kerberos = 0;
-               old_warning("remote host doesn't support Kerberos");
-               sp = getservbyname("shell", "tcp");
-               if (sp == NULL) {
-                       (void)fprintf(stderr,
-                           "rcp: unknown service shell/tcp\n");
-                       exit(1);
-               }
-               port = sp->s_port;
-               goto again;
+#endif
+                       rem = rcmd(&host, port, pwd->pw_name, suser, bp, 0);
+               (void)free(bp);
+               if (rem < 0)
+                       continue;
+               (void)seteuid(userid);
+               tos = IPTOS_THROUGHPUT;
+               if (setsockopt(rem, IPPROTO_IP, IP_TOS,
+                   (char *)&tos, sizeof(int)) < 0)
+                       perror("rcp: setsockopt TOS (ignored)");
+               sink(1, argv + argc - 1);
+               (void)seteuid(0);
+               (void)close(rem);
+               rem = -1;

        }
 }
        }
 }

-#endif /* KERBEROS */

 
 verifydir(cp)
        char *cp;
 
 verifydir(cp)
        char *cp;


@@ -342,7 +374,7 @@ verifydir(cp)
                        return;
                errno = ENOTDIR;
        }
                        return;
                errno = ENOTDIR;
        }

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

        exit(1);
 }
 
        exit(1);
 }
 


@@ -371,11 +403,10 @@ okname(cp0)
                        goto bad;
                if (!isalpha(c) && !isdigit(c) && c != '_' && c != '-')
                        goto bad;
                        goto bad;
                if (!isalpha(c) && !isdigit(c) && c != '_' && c != '-')
                        goto bad;

-               cp++;
-       } while (*cp);
+       } while (*++cp);

        return(1);
 bad:
        return(1);
 bad:

-       fprintf(stderr, "rcp: invalid user name %s\n", cp0);
+       (void)fprintf(stderr, "rcp: invalid user name %s\n", cp0);

        return(0);
 }
 
        return(0);
 }
 


@@ -383,7 +414,7 @@ susystem(s)
        char *s;
 {
        int status, pid, w;
        char *s;
 {
        int status, pid, w;

-       register int (*istat)(), (*qstat)();
+       register sig_t istat, qstat;

 
        if ((pid = vfork()) == 0) {
                (void)setuid(userid);
 
        if ((pid = vfork()) == 0) {
                (void)setuid(userid);


@@ -416,7 +447,7 @@ source(argc, argv)
        for (x = 0; x < argc; x++) {
                name = argv[x];
                if ((f = open(name, O_RDONLY, 0)) < 0) {
        for (x = 0; x < argc; x++) {
                name = argv[x];
                if ((f = open(name, O_RDONLY, 0)) < 0) {

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

                        continue;
                }
                if (fstat(f, &stb) < 0)
                        continue;
                }
                if (fstat(f, &stb) < 0)


@@ -448,17 +479,17 @@ notreg:                   (void)close(f);
                         * Make it compatible with possible future
                         * versions expecting microseconds.
                         */
                         * 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));
+                       (void)snprintf(buf, sizeof(buf),
+                           "T%ld 0 %ld 0\n", stb.st_mtime, stb.st_atime);
+                       (void)write(rem, buf, (int)strlen(buf));

                        if (response() < 0) {
                                (void)close(f);
                                continue;
                        }
                }
                        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));
+               (void)snprintf(buf, sizeof(buf),
+                   "C%04o %ld %s\n", stb.st_mode&07777, stb.st_size, last);
+               (void)write(rem, buf, (int)strlen(buf));

                if (response() < 0) {
                        (void)close(f);
                        continue;
                if (response() < 0) {
                        (void)close(f);
                        continue;


@@ -480,7 +511,7 @@ notreg:                     (void)close(f);
                if (readerr == 0)
                        (void)write(rem, "", 1);
                else
                if (readerr == 0)
                        (void)write(rem, "", 1);
                else

-                       error("rcp: %s: %s\n", name, sys_errlist[readerr]);
+                       error("rcp: %s: %s\n", name, strerror(readerr));

                (void)response();
        }
 }
                (void)response();
        }
 }


@@ -489,12 +520,12 @@ rsource(name, statp)
        char *name;
        struct stat *statp;
 {
        char *name;
        struct stat *statp;
 {

-       DIR *d;
-       struct direct *dp;
-       char *last, *bufv[1], buf[BUFSIZ];
+       DIR *dirp;
+       struct dirent *dp;
+       char *last, *vect[1], path[MAXPATHLEN];

 
 

-       if (!(d = opendir(name))) {
-               error("rcp: %s: %s\n", name, sys_errlist[errno]);
+       if (!(dirp = opendir(name))) {
+               error("rcp: %s: %s\n", name, strerror(errno));

                return;
        }
        last = rindex(name, '/');
                return;
        }
        last = rindex(name, '/');


@@ -503,34 +534,35 @@ rsource(name, statp)
        else
                last++;
        if (pflag) {
        else
                last++;
        if (pflag) {

-               (void)sprintf(buf, "T%ld 0 %ld 0\n",
-                   statp->st_mtime, statp->st_atime);
-               (void)write(rem, buf, strlen(buf));
+               (void)snprintf(path, sizeof(path),
+                   "T%ld 0 %ld 0\n", statp->st_mtime, statp->st_atime);
+               (void)write(rem, path, (int)strlen(path));

                if (response() < 0) {
                if (response() < 0) {

-                       closedir(d);
+                       closedir(dirp);

                        return;
                }
        }
                        return;
                }
        }

-       (void)sprintf(buf, "D%04o %d %s\n", statp->st_mode&07777, 0, last);
-       (void)write(rem, buf, strlen(buf));
+       (void)snprintf(path, sizeof(path),
+           "D%04o %d %s\n", statp->st_mode&07777, 0, last);
+       (void)write(rem, path, (int)strlen(path));

        if (response() < 0) {
        if (response() < 0) {

-               closedir(d);
+               closedir(dirp);

                return;
        }
                return;
        }

-       while (dp = readdir(d)) {
+       while (dp = readdir(dirp)) {

                if (dp->d_ino == 0)
                        continue;
                if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
                        continue;
                if (dp->d_ino == 0)
                        continue;
                if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
                        continue;

-               if (strlen(name) + 1 + strlen(dp->d_name) >= BUFSIZ - 1) {
-                       error("%s/%s: Name too long.\n", name, dp->d_name);
+               if (strlen(name) + 1 + strlen(dp->d_name) >= MAXPATHLEN - 1) {
+                       error("%s/%s: name too long.\n", name, dp->d_name);

                        continue;
                }
                        continue;
                }

-               (void)sprintf(buf, "%s/%s", name, dp->d_name);
-               bufv[0] = buf;
-               source(1, bufv);
+               (void)snprintf(path, sizeof(path), "%s/%s", name, dp->d_name);
+               vect[0] = path;
+               source(1, vect);

        }
        }

-       closedir(d);
+       closedir(dirp);

        (void)write(rem, "E\n", 2);
        (void)response();
 }
        (void)write(rem, "E\n", 2);
        (void)response();
 }


@@ -568,6 +600,7 @@ response()
        /*NOTREACHED*/
 }
 
        /*NOTREACHED*/
 }
 

+void

 lostconn()
 {
        if (!iamremote)
 lostconn()
 {
        if (!iamremote)


@@ -579,23 +612,24 @@ sink(argc, argv)
        int argc;
        char **argv;
 {
        int argc;
        char **argv;
 {

-       off_t i, j;
-       char *targ, *whopp, *cp;
-       int of, mode, wrerr, exists, first, count, amt, size;
-       BUF *bp;
+       register char *cp;

        static BUF buffer;
        struct stat stb;
        static BUF buffer;
        struct stat stb;

-       int targisdir = 0;
-       int mask = umask(0);
-       char *myargv[1];
-       char cmdbuf[BUFSIZ], nambuf[BUFSIZ];
-       int setimes = 0;

        struct timeval tv[2];
        struct timeval tv[2];

-       BUF *allocbuf();
-#define atime  tv[0]
-#define mtime  tv[1]
-#define        SCREWUP(str)    { whopp = str; goto screwup; }
+       enum { YES, NO, DISPLAYED } wrerr;
+       BUF *bp, *allocbuf();
+       off_t i, j;
+       char ch, *targ, *why;
+       int amt, count, exists, first, mask, mode;
+       int ofd, setimes, size, targisdir;
+       char *np, *vect[1], buf[BUFSIZ];
+
+#define        atime   tv[0]
+#define        mtime   tv[1]
+#define        SCREWUP(str)    { why = str; goto screwup; }

 
 

+       setimes = targisdir = 0;
+       mask = umask(0);

        if (!pflag)
                (void)umask(mask);
        if (argc != 1) {
        if (!pflag)
                (void)umask(mask);
        if (argc != 1) {


@@ -608,33 +642,37 @@ sink(argc, argv)
        (void)write(rem, "", 1);
        if (stat(targ, &stb) == 0 && (stb.st_mode & S_IFMT) == S_IFDIR)
                targisdir = 1;
        (void)write(rem, "", 1);
        if (stat(targ, &stb) == 0 && (stb.st_mode & S_IFMT) == S_IFDIR)
                targisdir = 1;

-       for (first = 1; ; first = 0) {
-               cp = cmdbuf;
+       for (first = 1;; first = 0) {
+               cp = buf;

                if (read(rem, cp, 1) <= 0)
                        return;
                if (*cp++ == '\n')
                if (read(rem, cp, 1) <= 0)
                        return;
                if (*cp++ == '\n')

-                       SCREWUP("unexpected '\\n'");
+                       SCREWUP("unexpected <newline>");

                do {
                do {

-                       if (read(rem, cp, 1) != 1)
+                       if (read(rem, &ch, sizeof(ch)) != sizeof(ch))

                                SCREWUP("lost connection");
                                SCREWUP("lost connection");

-               } while (*cp++ != '\n');
+                       *cp++ = ch;
+               } while (cp < &buf[BUFSIZ - 1] && ch != '\n');

                *cp = 0;
                *cp = 0;

-               if (cmdbuf[0] == '\01' || cmdbuf[0] == '\02') {
+
+               if (buf[0] == '\01' || buf[0] == '\02') {

                        if (iamremote == 0)
                        if (iamremote == 0)

-                               (void)write(2, cmdbuf+1, strlen(cmdbuf+1));
-                       if (cmdbuf[0] == '\02')
+                               (void)write(2, buf + 1, (int)strlen(buf + 1));
+                       if (buf[0] == '\02')

                                exit(1);
                        errs++;
                        continue;
                }
                                exit(1);
                        errs++;
                        continue;
                }

-               *--cp = 0;
-               cp = cmdbuf;
-               if (*cp == 'E') {
+               if (buf[0] == 'E') {

                        (void)write(rem, "", 1);
                        return;
                }
 
                        (void)write(rem, "", 1);
                        return;
                }
 

+               if (ch == '\n')
+                       *--cp = 0;
+

 #define getnum(t) (t) = 0; while (isdigit(*cp)) (t) = (t) * 10 + (*cp++ - '0');
 #define getnum(t) (t) = 0; while (isdigit(*cp)) (t) = (t) * 10 + (*cp++ - '0');

+               cp = buf;

                if (*cp == 'T') {
                        setimes++;
                        cp++;
                if (*cp == 'T') {
                        setimes++;
                        cp++;


@@ -667,9 +705,8 @@ sink(argc, argv)
                        }
                        SCREWUP("expected control record");
                }
                        }
                        SCREWUP("expected control record");
                }

-               cp++;

                mode = 0;
                mode = 0;

-               for (; cp < cmdbuf+5; cp++) {
+               for (++cp; cp < buf + 5; cp++) {

                        if (*cp < '0' || *cp > '7')
                                SCREWUP("bad mode");
                        mode = (mode << 3) | (*cp - '0');
                        if (*cp < '0' || *cp > '7')
                                SCREWUP("bad mode");
                        mode = (mode << 3) | (*cp - '0');


@@ -681,47 +718,57 @@ sink(argc, argv)
                        size = size * 10 + (*cp++ - '0');
                if (*cp++ != ' ')
                        SCREWUP("size not delimited");
                        size = size * 10 + (*cp++ - '0');
                if (*cp++ != ' ')
                        SCREWUP("size not delimited");

-               if (targisdir)
-                       (void)sprintf(nambuf, "%s%s%s", targ,
+               if (targisdir) {
+                       static char *namebuf;
+                       static int cursize;
+                       size_t need;
+
+                       need = strlen(targ) + strlen(cp) + 250;
+                       if (need > cursize) {
+                               if (!(namebuf = malloc(need)))
+                                       error("out of memory\n");
+                       }
+                       (void)snprintf(namebuf, need, "%s%s%s", targ,

                            *targ ? "/" : "", cp);
                            *targ ? "/" : "", cp);

+                       np = namebuf;
+               }

                else
                else

-                       (void)strcpy(nambuf, targ);
-               exists = stat(nambuf, &stb) == 0;
-               if (cmdbuf[0] == 'D') {
+                       np = targ;
+               exists = stat(np, &stb) == 0;
+               if (buf[0] == 'D') {

                        if (exists) {
                                if ((stb.st_mode&S_IFMT) != S_IFDIR) {
                                        errno = ENOTDIR;
                                        goto bad;
                                }
                                if (pflag)
                        if (exists) {
                                if ((stb.st_mode&S_IFMT) != S_IFDIR) {
                                        errno = ENOTDIR;
                                        goto bad;
                                }
                                if (pflag)

-                                       (void)chmod(nambuf, mode);
-                       } else if (mkdir(nambuf, mode) < 0)
+                                       (void)chmod(np, mode);
+                       } else if (mkdir(np, mode) < 0)

                                goto bad;
                                goto bad;

-                       myargv[0] = nambuf;
-                       sink(1, myargv);
+                       vect[0] = np;
+                       sink(1, vect);

                        if (setimes) {
                                setimes = 0;
                        if (setimes) {
                                setimes = 0;

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

                        }
                        continue;
                }
                        }
                        continue;
                }

-               if ((of = open(nambuf, O_WRONLY|O_CREAT, mode)) < 0) {
-       bad:
-                       error("rcp: %s: %s\n", nambuf, sys_errlist[errno]);
+               if ((ofd = open(np, O_WRONLY|O_CREAT, mode)) < 0) {
+bad:                   error("rcp: %s: %s\n", np, strerror(errno));

                        continue;
                }
                if (exists && pflag)
                        continue;
                }
                if (exists && pflag)

-                       (void)fchmod(of, mode);
+                       (void)fchmod(ofd, mode);

                (void)write(rem, "", 1);
                (void)write(rem, "", 1);

-               if ((bp = allocbuf(&buffer, of, BUFSIZ)) == 0) {
-                       (void)close(of);
+               if ((bp = allocbuf(&buffer, ofd, BUFSIZ)) == 0) {
+                       (void)close(ofd);

                        continue;
                }
                cp = bp->buf;
                count = 0;
                        continue;
                }
                cp = bp->buf;
                count = 0;

-               wrerr = 0;
+               wrerr = NO;

                for (i = 0; i < size; i += BUFSIZ) {
                        amt = BUFSIZ;
                        if (i + amt > size)
                for (i = 0; i < size; i += BUFSIZ) {
                        amt = BUFSIZ;
                        if (i + amt > size)


@@ -730,45 +777,53 @@ sink(argc, argv)
                        do {
                                j = read(rem, cp, amt);
                                if (j <= 0) {
                        do {
                                j = read(rem, cp, amt);
                                if (j <= 0) {

-                                       if (j == 0)
-                                           error("rcp: dropped connection");
-                                       else
-                                           error("rcp: %s\n",
-                                               sys_errlist[errno]);
+                                       error("rcp: %s\n",
+                                           j ? strerror(errno) :
+                                           "dropped connection");

                                        exit(1);
                                }
                                amt -= j;
                                cp += j;
                        } while (amt > 0);
                        if (count == bp->cnt) {
                                        exit(1);
                                }
                                amt -= j;
                                cp += j;
                        } while (amt > 0);
                        if (count == bp->cnt) {

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

                                count = 0;
                                cp = bp->buf;
                        }
                }
                                count = 0;
                                cp = bp->buf;
                        }
                }

-               if (count != 0 && wrerr == 0 &&
-                   write(of, bp->buf, count) != count)
-                       wrerr++;
-               if (ftruncate(of, size))
-                       error("rcp: can't truncate %s: %s\n",
-                           nambuf, sys_errlist[errno]);
-               (void)close(of);
+               if (count != 0 && wrerr == NO &&
+                   write(ofd, bp->buf, count) != count)
+                       wrerr = YES;
+               if (ftruncate(ofd, size)) {
+                       error("rcp: can't truncate %s: %s\n", np,
+                           strerror(errno));
+                       wrerr = DISPLAYED;
+               }
+               (void)close(ofd);

                (void)response();
                (void)response();

-               if (setimes) {
+               if (setimes && wrerr == NO) {

                        setimes = 0;
                        setimes = 0;

-                       if (utimes(nambuf, tv) < 0)
+                       if (utimes(np, tv) < 0) {

                                error("rcp: can't set times on %s: %s\n",
                                error("rcp: can't set times on %s: %s\n",

-                                   nambuf, sys_errlist[errno]);
-               }                                  
-               if (wrerr)
-                       error("rcp: %s: %s\n", nambuf, sys_errlist[errno]);
-               else
+                                   np, strerror(errno));
+                               wrerr = DISPLAYED;
+                       }
+               }
+               switch(wrerr) {
+               case YES:
+                       error("rcp: %s: %s\n", np, strerror(errno));
+                       break;
+               case NO:

                        (void)write(rem, "", 1);
                        (void)write(rem, "", 1);

+                       break;
+               case DISPLAYED:
+                       break;
+               }

        }
 screwup:
        }
 screwup:

-       error("rcp: protocol screwup: %s\n", whopp);
+       error("rcp: protocol screwup: %s\n", why);

        exit(1);
 }
 
        exit(1);
 }
 


@@ -778,11 +833,10 @@ allocbuf(bp, fd, blksize)
        int fd, blksize;
 {
        struct stat stb;
        int fd, blksize;
 {
        struct stat stb;

-       int size;
-       char *malloc();
+       size_t size;

 
        if (fstat(fd, &stb) < 0) {
 
        if (fstat(fd, &stb) < 0) {

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

                return(0);
        }
        size = roundup(stb.st_blksize, blksize);
                return(0);
        }
        size = roundup(stb.st_blksize, blksize);


@@ -791,8 +845,8 @@ allocbuf(bp, fd, blksize)
        if (bp->cnt < size) {
                if (bp->buf != 0)
                        free(bp->buf);
        if (bp->cnt < size) {
                if (bp->buf != 0)
                        free(bp->buf);

-               bp->buf = (char *)malloc((u_int)size);
-               if (bp->buf == 0) {
+               bp->buf = malloc(size);
+               if (!bp->buf) {

                        error("rcp: malloc: out of memory\n");
                        return(0);
                }
                        error("rcp: malloc: out of memory\n");
                        return(0);
                }


@@ -802,28 +856,35 @@ allocbuf(bp, fd, blksize)
 }
 
 /* VARARGS1 */
 }
 
 /* VARARGS1 */

-error(fmt, a1, a2, a3, a4, a5)
+error(fmt, a1, a2, a3)

        char *fmt;
        char *fmt;

-       int a1, a2, a3, a4, a5;
+       int a1, a2, a3;

 {
 {

-       int len;
-       char buf[BUFSIZ];
+       static FILE *fp;

 
        ++errs;
 
        ++errs;

-       buf[0] = 0x01;
-       (void)sprintf(buf + 1, fmt, a1, a2, a3, a4, a5);
-       len = strlen(buf);
-       (void)write(rem, buf, len);
+       if (!fp && !(fp = fdopen(rem, "w")))
+               return;
+       (void)fprintf(fp, "%c", 0x01);
+       (void)fprintf(fp, fmt, a1, a2, a3);
+       (void)fflush(fp);

        if (!iamremote)
        if (!iamremote)

-               (void)write(2, buf + 1, len - 1);
+               (void)fprintf(stderr, fmt, a1, a2, a3);

 }
 
 }
 

+nospace()
+{
+       (void)fprintf(stderr, "rcp: out of memory.\n");
+       exit(1);
+}
+
+

 usage()
 {
 #ifdef KERBEROS
        (void)fprintf(stderr, "%s\n\t%s\n",
 usage()
 {
 #ifdef KERBEROS
        (void)fprintf(stderr, "%s\n\t%s\n",

-           "usage: rcp [-k realm] [-px] f1 f2",
-           "or: rcp [-k realm] [-rpx] f1 ... fn directory");
+           "usage: rcp [-k realm] [-p] f1 f2",
+           "or: rcp [-k realm] [-rp] f1 ... fn directory");

 #else
        (void)fprintf(stderr,
            "usage: rcp [-p] f1 f2; or: rcp [-rp] f1 ... fn directory\n");
 #else
        (void)fprintf(stderr,
            "usage: rcp [-p] f1 f2; or: rcp [-rp] f1 ... fn directory\n");


@@ -837,4 +898,46 @@ old_warning(str)
 {
        (void)fprintf(stderr, "rcp: warning: %s, using standard rcp\n", str);
 }
 {
        (void)fprintf(stderr, "rcp: warning: %s, using standard rcp\n", str);
 }

-#endif
+
+int
+kerberos(host, bp, locuser, user)
+
+       char **host, *bp, *locuser, *user;
+{
+       struct servent *sp;
+
+again:
+       if (use_kerberos) {
+               rem = KSUCCESS;
+               errno = 0;
+               if (dest_realm == NULL)
+                       dest_realm = krb_realmofhost(*host);
+
+                       rem = krcmd(
+                               host, port,
+                               user, bp, 0, dest_realm);
+
+               if (rem < 0) {
+                       use_kerberos = 0;
+                       sp = getservbyname("shell", "tcp");
+                       if (sp == NULL) {
+                               (void)fprintf(stderr,
+                                   "rcp: unknown service shell/tcp\n");
+                               exit(1);
+                       }
+                       if (errno == ECONNREFUSED)
+                               old_warning(
+                                   "remote host doesn't support Kerberos");
+
+                       if (errno == ENOENT)
+                               old_warning(
+                                   "Can't provide Kerberos auth data");
+                       port = sp->s_port;
+                       goto again;
+               }
+       } else {
+               rem = rcmd(host, sp->s_port, locuser, user, bp, 0);
+       }
+       return(rem);
+}
+#endif /* KERBEROS */