date and time created 87/02/23 14:01:59 by karels

[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 86a1655..461d9d8 100644 (file)
--- a/usr/src/bin/mv/mv.c
+++ b/usr/src/bin/mv/mv.c
@@ -1,15 +1,28 @@
+/*
+ * Copyright (c) 1980 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) 1980 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif not lint
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)mv.c        4.7 (Berkeley) 83/01/01";
-#endif
+static char sccsid[] = "@(#)mv.c       5.3 (Berkeley) %G%";
+#endif not lint

 
 /*
  * mv file1 file2
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 
 /*
  * mv file1 file2
  */
 #include <sys/param.h>
 #include <sys/stat.h>

+#include <sys/time.h>

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

-#include <dir.h>
+#include <sys/dir.h>

 #include <errno.h>
 #include <signal.h>
 
 #include <errno.h>
 #include <signal.h>
 


@@ -34,6 +47,7 @@ main(argc, argv)
 {
        register i, r;
        register char *arg;
 {
        register i, r;
        register char *arg;

+       char *dest;

 
        if (argc < 2)
                goto usage;
 
        if (argc < 2)
                goto usage;


@@ -63,32 +77,21 @@ main(argc, argv)
        }
        if (argc < 3)
                goto usage;
        }
        if (argc < 3)
                goto usage;

-       setuid(getuid());
-       r = 0;
-       if (argc > 3) {
-               register char *dest;
-
-               dest = argv[argc-1];
-               if (stat(dest, &s2) < 0 || !ISDIR(s2))
-                       goto usage;
+       dest = argv[argc-1];
+       if (stat(dest, &s2) >= 0 && ISDIR(s2)) {
+               r = 0;

                for (i = 1; i < argc-1; i++)
                        r |= movewithshortname(argv[i], dest);
                exit(r);
        }
                for (i = 1; i < argc-1; i++)
                        r |= movewithshortname(argv[i], dest);
                exit(r);
        }

-       if (stat(argv[2], &s2) >= 0 && ISDIR(s2)) {
-               struct stat s1;
-
-               if (stat(argv[1], &s1) >= 0 && ISDIR(s1))
-                       r = move(argv[1], argv[2]);
-               else
-                       r = movewithshortname(argv[1], argv[2]);
-       } else
-               r = move(argv[1], argv[2]);
+       if (argc > 3)
+               goto usage;
+       r = move(argv[1], argv[2]);

        exit(r);
        /*NOTREACHED*/
 usage:
        fprintf(stderr,
        exit(r);
        /*NOTREACHED*/
 usage:
        fprintf(stderr,

-"usage: mv [-if] f1 ... fn d1 (where `fn' is a file or directory)\n");
+"usage: mv [-if] f1 f2 or mv [-if] f1 ... fn d1 (`fn' is a file or directory)\n");

        return (1);
 }
 
        return (1);
 }
 


@@ -111,9 +114,10 @@ movewithshortname(src, dest)
 move(source, target)
        char *source, *target;
 {
 move(source, target)
        char *source, *target;
 {

+       int targetexists;

 
        if (lstat(source, &s1) < 0) {
 
        if (lstat(source, &s1) < 0) {

-               error("cannot access %s", source);
+               Perror2(source, "Cannot access");

                return (1);
        }
        /*
                return (1);
        }
        /*


@@ -122,39 +126,35 @@ move(source, target)
         * the move is on a nondirectory and not across
         * file systems.
         */
         * the move is on a nondirectory and not across
         * file systems.
         */

-       if (lstat(target, &s2) >= 0) {
-               if (iflag && !fflag && query("remove %s? ", target) == 0)
-                       return (1);
+       targetexists = lstat(target, &s2) >= 0;
+       if (targetexists) {

                if (s1.st_dev == s2.st_dev && s1.st_ino == s2.st_ino) {
                        error("%s and %s are identical", source, target);
                        return (1);
                }
                if (s1.st_dev == s2.st_dev && s1.st_ino == s2.st_ino) {
                        error("%s and %s are identical", source, target);
                        return (1);
                }

+               if (iflag && !fflag && isatty(fileno(stdin)) &&
+                   query("remove %s? ", target) == 0)
+                       return (1);

                if (access(target, 2) < 0 && !fflag && isatty(fileno(stdin))) {
                        if (query("override protection %o for %s? ",
                          s2.st_mode & MODEBITS, target) == 0)
                                return (1);
                }
                if (access(target, 2) < 0 && !fflag && isatty(fileno(stdin))) {
                        if (query("override protection %o for %s? ",
                          s2.st_mode & MODEBITS, target) == 0)
                                return (1);
                }

-               if (rename(source, target) >= 0)
-                       return (0);
-               if (errno != EXDEV) {
-                       Perror2(source, "rename");
-                       return (1);
-               }
-               if (ISDIR(s1)) {
-                       error("can't mv directories across file systems");
-                       return (1);
-               }
-               if (unlink(target) < 0) {
-                       error("cannot unlink %s", target);
-                       return (1);
-               }
-       } else {
-               if (rename(source, target) >= 0)
-                       return (0);
-               if (ISDIR(s1)) {
-                       Perror2(source, "rename");
-                       return (1);
-               }
+       }
+       if (rename(source, target) >= 0)
+               return (0);
+       if (errno != EXDEV) {
+               Perror2(errno == ENOENT && targetexists == 0 ? target : source,
+                   "rename");
+               return (1);
+       }
+       if (ISDIR(s1)) {
+               error("can't mv directories across file systems");
+               return (1);
+       }
+       if (targetexists && unlink(target) < 0) {
+               Perror2(target, "Cannot unlink");
+               return (1);

        }
        /*
         * File can't be renamed, try to recreate the symbolic
        }
        /*
         * File can't be renamed, try to recreate the symbolic


@@ -163,12 +163,15 @@ move(source, target)
         */
        if (ISLNK(s1)) {
                register m;
         */
        if (ISLNK(s1)) {
                register m;

-               char symln[MAXPATHLEN];
+               char symln[MAXPATHLEN + 1];

 
 

-               if (readlink(source, symln, sizeof (symln)) < 0) {
+               m = readlink(source, symln, sizeof (symln) - 1);
+               if (m < 0) {

                        Perror(source);
                        return (1);
                }
                        Perror(source);
                        return (1);
                }

+               symln[m] = '\0';
+

                m = umask(~(s1.st_mode & MODEBITS));
                if (symlink(symln, target) < 0) {
                        Perror(target);
                m = umask(~(s1.st_mode & MODEBITS));
                if (symlink(symln, target) < 0) {
                        Perror(target);


@@ -178,31 +181,63 @@ move(source, target)
                goto cleanup;
        }
        if (ISDEV(s1)) {
                goto cleanup;
        }
        if (ISDEV(s1)) {

+               struct timeval tv[2];
+

                if (mknod(target, s1.st_mode, s1.st_rdev) < 0) {
                        Perror(target);
                        return (1);
                }
                if (mknod(target, s1.st_mode, s1.st_rdev) < 0) {
                        Perror(target);
                        return (1);
                }

-               (void) utime(target, &s1.st_atime);
+
+               tv[0].tv_sec = s1.st_atime;
+               tv[0].tv_usec = 0;
+               tv[1].tv_sec = s1.st_mtime;
+               tv[1].tv_usec = 0;
+               (void) utimes(target, tv);

                goto cleanup;
        }
        if (ISREG(s1)) {
                goto cleanup;
        }
        if (ISREG(s1)) {

-               int i, c, status;
+               register int fi, fo, n;
+               struct timeval tv[2];
+               char buf[MAXBSIZE];

 
 

-               i = fork();
-               if (i == -1) {
-                       error("try again");
+               fi = open(source, 0);
+               if (fi < 0) {
+                       Perror(source);

                        return (1);
                }
                        return (1);
                }

-               if (i == 0) {
-                       execl("/bin/cp", "cp", source, target, 0);
-                       error("cannot exec /bin/cp");
-                       exit(1);
-               }
-               while ((c = wait(&status)) != i && c != -1)
-                       ;
-               if (status != 0)
+
+               fo = creat(target, s1.st_mode & MODEBITS);
+               if (fo < 0) {
+                       Perror(target);
+                       close(fi);

                        return (1);
                        return (1);

-               (void) utime(target, &s1.st_atime);
+               }
+
+               for (;;) {
+                       n = read(fi, buf, sizeof buf);
+                       if (n == 0) {
+                               break;
+                       } else if (n < 0) {
+                               Perror2(source, "read");
+                               close(fi);
+                               close(fo);
+                               return (1);
+                       } else if (write(fo, buf, n) != n) {
+                               Perror2(target, "write");
+                               close(fi);
+                               close(fo);
+                               return (1);
+                       }
+               }
+
+               close(fi);
+               close(fo);
+
+               tv[0].tv_sec = s1.st_atime;
+               tv[0].tv_usec = 0;
+               tv[1].tv_sec = s1.st_mtime;
+               tv[1].tv_usec = 0;
+               (void) utimes(target, tv);

                goto cleanup;
        }
        error("%s: unknown file type %o", source, s1.st_mode);
                goto cleanup;
        }
        error("%s: unknown file type %o", source, s1.st_mode);


@@ -210,7 +245,7 @@ move(source, target)
 
 cleanup:
        if (unlink(source) < 0) {
 
 cleanup:
        if (unlink(source) < 0) {

-               error("cannot unlink %s", source);
+               Perror2(source, "Cannot unlink");

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


@@ -220,7 +255,7 @@ cleanup:
 query(prompt, a1, a2)
        char *a1;
 {
 query(prompt, a1, a2)
        char *a1;
 {

-       register char i, c;
+       register int i, c;

 
        fprintf(stderr, prompt, a1, a2);
        i = c = getchar();
 
        fprintf(stderr, prompt, a1, a2);
        i = c = getchar();