BSD 4_4 release

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

diff --git a/usr/src/bin/mv/mv.c b/usr/src/bin/mv/mv.c
index ff65380..0fae2b9 100644 (file)
--- a/usr/src/bin/mv/mv.c
+++ b/usr/src/bin/mv/mv.c
@@ -1,69 +1,91 @@
 /*
 /*

- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Ken Smith of The State University of New York at Buffalo.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Ken Smith of The State University of New York at Buffalo.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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 ``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
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1989, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)mv.c       5.9 (Berkeley) 5/31/90";
+static char sccsid[] = "@(#)mv.c       8.1 (Berkeley) 5/31/93";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>

-#include <sys/file.h>
-#include <sys/errno.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>

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

+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

+#include <unistd.h>
+

 #include "pathnames.h"
 
 #include "pathnames.h"
 

-extern int errno;

 int fflg, iflg;
 
 int fflg, iflg;
 

+int    copy __P((char *, char *));
+int    do_move __P((char *, char *));
+int    fastcopy __P((char *, char *, struct stat *));
+void   usage __P((void));
+
+int

 main(argc, argv)
        int argc;
 main(argc, argv)
        int argc;

-       char **argv;
+       char *argv[];

 {
 {

-       extern char *optarg;
-       extern int optind;

        register int baselen, exitval, len;
        register char *p, *endp;
        register int baselen, exitval, len;
        register char *p, *endp;

-       struct stat sbuf;
+       struct stat sb;

        int ch;
        char path[MAXPATHLEN + 1];
 
        while (((ch = getopt(argc, argv, "-if")) != EOF))
                switch((char)ch) {
                case 'i':
        int ch;
        char path[MAXPATHLEN + 1];
 
        while (((ch = getopt(argc, argv, "-if")) != EOF))
                switch((char)ch) {
                case 'i':

-                       ++iflg;
+                       iflg = 1;

                        break;
                case 'f':
                        break;
                case 'f':

-                       ++fflg;
+                       fflg = 1;

                        break;
                        break;

-               case '-':               /* undocumented; for compatibility */
+               case '-':               /* Undocumented; for compatibility. */

                        goto endarg;
                case '?':
                default:
                        goto endarg;
                case '?':
                default:


@@ -76,47 +98,46 @@ endarg:     argc -= optind;
                usage();
 
        /*
                usage();
 
        /*

-        * if stat fails on target, it doesn't exist (or can't be accessed
-        * by the user, doesn't matter which) try the move.  If target exists,
-        * and isn't a directory, try the move.  More than 2 arguments is an
-        * error.
+        * If the stat on the target fails or the target isn't a directory,
+        * try the move.  More than 2 arguments is an error in this case.

         */
         */

-       if (stat(argv[argc - 1], &sbuf) || !S_ISDIR(sbuf.st_mode)) {
+       if (stat(argv[argc - 1], &sb) || !S_ISDIR(sb.st_mode)) {

                if (argc > 2)
                        usage();
                exit(do_move(argv[0], argv[1]));
        }
 
                if (argc > 2)
                        usage();
                exit(do_move(argv[0], argv[1]));
        }
 

-       /* got a directory, move each file into it */
+       /* It's a directory, move each file into it. */

        (void)strcpy(path, argv[argc - 1]);
        baselen = strlen(path);
        endp = &path[baselen];
        *endp++ = '/';
        ++baselen;
        for (exitval = 0; --argc; ++argv) {
        (void)strcpy(path, argv[argc - 1]);
        baselen = strlen(path);
        endp = &path[baselen];
        *endp++ = '/';
        ++baselen;
        for (exitval = 0; --argc; ++argv) {

-               if ((p = rindex(*argv, '/')) == NULL)
+               if ((p = strrchr(*argv, '/')) == NULL)

                        p = *argv;
                else
                        ++p;
                        p = *argv;
                else
                        ++p;

-               if ((baselen + (len = strlen(p))) >= MAXPATHLEN)
-                       (void)fprintf(stderr,
-                           "mv: %s: destination pathname too long\n", *argv);
-               else {
-                       bcopy(p, endp, len + 1);
+               if ((baselen + (len = strlen(p))) >= MAXPATHLEN) {
+                       warnx("%s: destination pathname too long", *argv);
+                       exitval = 1;
+               } else {
+                       memmove(endp, p, len + 1);

                        exitval |= do_move(*argv, path);
                }
        }
        exit(exitval);
 }
 
                        exitval |= do_move(*argv, path);
                }
        }
        exit(exitval);
 }
 

+int

 do_move(from, to)
        char *from, *to;
 {
 do_move(from, to)
        char *from, *to;
 {

-       struct stat sbuf;
+       struct stat sb;

        int ask, ch;
 
        /*
        int ask, ch;
 
        /*

-        * Check access.  If interactive and file exists ask user if it
+        * Check access.  If interactive and file exists, ask user if it

         * should be replaced.  Otherwise if file exists but isn't writable
         * make sure the user wants to clobber it.
         */
         * should be replaced.  Otherwise if file exists but isn't writable
         * make sure the user wants to clobber it.
         */


@@ -126,38 +147,39 @@ do_move(from, to)
                        (void)fprintf(stderr, "overwrite %s? ", to);
                        ask = 1;
                }
                        (void)fprintf(stderr, "overwrite %s? ", to);
                        ask = 1;
                }

-               else if (access(to, W_OK) && !stat(to, &sbuf)) {
+               else if (access(to, W_OK) && !stat(to, &sb)) {

                        (void)fprintf(stderr, "override mode %o on %s? ",
                        (void)fprintf(stderr, "override mode %o on %s? ",

-                           sbuf.st_mode & 07777, to);
+                           sb.st_mode & 07777, to);

                        ask = 1;
                }
                if (ask) {
                        if ((ch = getchar()) != EOF && ch != '\n')
                                while (getchar() != '\n');
                        if (ch != 'y')
                        ask = 1;
                }
                if (ask) {
                        if ((ch = getchar()) != EOF && ch != '\n')
                                while (getchar() != '\n');
                        if (ch != 'y')

-                               return(0);
+                               return (0);

                }
        }
        if (!rename(from, to))
                }
        }
        if (!rename(from, to))

-               return(0);
+               return (0);
+

        if (errno != EXDEV) {
        if (errno != EXDEV) {

-               (void)fprintf(stderr,
-                   "mv: rename %s to %s: %s\n", from, to, strerror(errno));
-               return(1);
+               warn("rename %s to %s", from, to);
+               return (1);

        }
        }

+

        /*
        /*

-        * if rename fails, and it's a regular file, do the copy
-        * internally; otherwise, use cp and rm.
+        * If rename fails, and it's a regular file, do the copy internally;
+        * otherwise, use cp and rm.

         */
         */

-       if (stat(from, &sbuf)) {
-               (void)fprintf(stderr,
-                   "mv: %s: %s\n", from, strerror(errno));
-               return(1);
+       if (stat(from, &sb)) {
+               warn("%s", from);
+               return (1);

        }
        }

-       return(S_ISREG(sbuf.st_mode) ?
-           fastcopy(from, to, &sbuf) : copy(from, to));
+       return (S_ISREG(sb.st_mode) ?
+           fastcopy(from, to, &sb) : copy(from, to));

 }
 
 }
 

+int

 fastcopy(from, to, sbp)
        char *from, *to;
        struct stat *sbp;
 fastcopy(from, to, sbp)
        char *from, *to;
        struct stat *sbp;


@@ -166,72 +188,104 @@ fastcopy(from, to, sbp)
        static u_int blen;
        static char *bp;
        register int nread, from_fd, to_fd;
        static u_int blen;
        static char *bp;
        register int nread, from_fd, to_fd;

-       char *malloc();

 
        if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
 
        if ((from_fd = open(from, O_RDONLY, 0)) < 0) {

-               (void)fprintf(stderr,
-                   "mv: %s: %s\n", from, strerror(errno));
-               return(1);
+               warn("%s", from);
+               return (1);

        }
        }

-       if ((to_fd = open(to, O_WRONLY|O_CREAT|O_TRUNC, sbp->st_mode)) < 0) {
-               (void)fprintf(stderr,
-                   "mv: %s: %s\n", to, strerror(errno));
+       if ((to_fd = open(to, O_CREAT|O_TRUNC|O_WRONLY, sbp->st_mode)) < 0) {
+               warn("%s", to);

                (void)close(from_fd);
                (void)close(from_fd);

-               return(1);
+               return (1);

        }
        if (!blen && !(bp = malloc(blen = sbp->st_blksize))) {
        }
        if (!blen && !(bp = malloc(blen = sbp->st_blksize))) {

-               (void)fprintf(stderr, "mv: %s: out of memory.\n", from);
-               return(1);
+               warn(NULL);
+               return (1);

        }
        while ((nread = read(from_fd, bp, blen)) > 0)
                if (write(to_fd, bp, nread) != nread) {
        }
        while ((nread = read(from_fd, bp, blen)) > 0)
                if (write(to_fd, bp, nread) != nread) {

-                       (void)fprintf(stderr, "mv: %s: %s\n",
-                           to, strerror(errno));
+                       warn("%s", to);

                        goto err;
                }
        if (nread < 0) {
                        goto err;
                }
        if (nread < 0) {

-               (void)fprintf(stderr, "mv: %s: %s\n", from, strerror(errno));
-err:           (void)unlink(to);
+               warn("%s", from);
+err:           if (unlink(to))
+                       warn("%s: remove", to);

                (void)close(from_fd);
                (void)close(to_fd);
                (void)close(from_fd);
                (void)close(to_fd);

-               return(1);
+               return (1);

        }
        }

-       (void)fchown(to_fd, sbp->st_uid, sbp->st_gid);
-       (void)fchmod(to_fd, sbp->st_mode);
-

        (void)close(from_fd);
        (void)close(from_fd);

-       (void)close(to_fd);
+
+       if (fchown(to_fd, sbp->st_uid, sbp->st_gid))
+               warn("%s: set owner/group", to);
+       if (fchmod(to_fd, sbp->st_mode))
+               warn("%s: set mode", to);

 
        tval[0].tv_sec = sbp->st_atime;
        tval[1].tv_sec = sbp->st_mtime;
        tval[0].tv_usec = tval[1].tv_usec = 0;
 
        tval[0].tv_sec = sbp->st_atime;
        tval[1].tv_sec = sbp->st_mtime;
        tval[0].tv_usec = tval[1].tv_usec = 0;

-       (void)utimes(to, tval);
-       (void)unlink(from);
-       return(0);
+       if (utimes(to, tval))
+               warn("%s: set times", to);
+
+       if (close(to_fd)) {
+               warn("%s", to);
+               return (1);
+       }
+
+       if (unlink(from)) {
+               warn("%s: remove", from);
+               return (1);
+       }
+       return (0);

 }
 
 }
 

+int

 copy(from, to)
        char *from, *to;
 {
        int pid, status;
 
        if (!(pid = vfork())) {
 copy(from, to)
        char *from, *to;
 {
        int pid, status;
 
        if (!(pid = vfork())) {

-               execlp(_PATH_CP, "mv", "-pr", from, to);
-               (void)fprintf(stderr, "mv: can't exec %s.\n", _PATH_CP);
+               execl(_PATH_CP, "mv", "-pR", from, to, NULL);
+               warn("%s", _PATH_CP);

                _exit(1);
        }
                _exit(1);
        }

-       (void)waitpid(pid, &status, 0);
-       if (!WIFEXITED(status) || WEXITSTATUS(status))
-               return(1);
+       if (waitpid(pid, &status, 0) == -1) {
+               warn("%s: waitpid", _PATH_CP);
+               return (1);
+       }
+       if (!WIFEXITED(status)) {
+               warn("%s: did not terminate normally", _PATH_CP);
+               return (1);
+       }
+       if (WEXITSTATUS(status)) {
+               warn("%s: terminated with %d (non-zero) status",
+                   _PATH_CP, WEXITSTATUS(status));
+               return (1);
+       }

        if (!(pid = vfork())) {
        if (!(pid = vfork())) {

-               execlp(_PATH_RM, "mv", "-rf", from);
-               (void)fprintf(stderr, "mv: can't exec %s.\n", _PATH_RM);
+               execl(_PATH_RM, "mv", "-rf", from, NULL);
+               warn("%s", _PATH_RM);

                _exit(1);
        }
                _exit(1);
        }

-       (void)waitpid(pid, &status, 0);
-       return(!WIFEXITED(status) || WEXITSTATUS(status));
+       if (waitpid(pid, &status, 0) == -1) {
+               warn("%s: waitpid", _PATH_RM);
+               return (1);
+       }
+       if (!WIFEXITED(status)) {
+               warn("%s: did not terminate normally", _PATH_RM);
+               return (1);
+       }
+       if (WEXITSTATUS(status)) {
+               warn("%s: terminated with %d (non-zero) status",
+                   _PATH_RM, WEXITSTATUS(status));
+               return (1);
+       }
+       return (0);

 }
 
 }
 

+void

 usage()
 {
        (void)fprintf(stderr,
 usage()
 {
        (void)fprintf(stderr,