Got rid of the erroneous --dry-run short-circuit in the directory

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index e46d086..6b5b500 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -32,6 +32,7 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int force_delete;
 extern int recurse;
+extern int keep_dirlinks;
 extern int make_backups;
 extern char *backup_dir;
 extern int inplace;
@@ -51,33 +52,38 @@ void free_sums(struct sum_struct *s)
  * delete a file or directory. If force_delete is set then delete
  * recursively
  */
-int delete_file(char *fname)
+int delete_file(char *fname, int flags)
 {
        DIR *d;
        struct dirent *di;
        char buf[MAXPATHLEN];
        STRUCT_STAT st;
-       int ret;
-
-#if SUPPORT_LINKS
-       ret = do_lstat(fname, &st);
-#else
-       ret = do_stat(fname, &st);
-#endif
-       if (ret)
-               return -1;
 
-       if (!S_ISDIR(st.st_mode)) {
-               if (robust_unlink(fname) == 0 || errno == ENOENT)
+       if (!(flags & DEL_DIR)) {
+               if (robust_unlink(fname) == 0) {
+                       if (verbose && !(flags & DEL_TERSE)) {
+                               rprintf(FINFO, "deleting %s\n",
+                                       safe_fname(fname));
+                       }
+                       return 0;
+               }
+               if (errno == ENOENT)
                        return 0;
                rsyserr(FERROR, errno, "delete_file: unlink %s failed",
                        full_fname(fname));
                return -1;
        }
 
-       if (do_rmdir(fname) == 0 || errno == ENOENT)
+       if (do_rmdir(fname) == 0) {
+               if (verbose && !(flags & DEL_TERSE)) {
+                       rprintf(FINFO, "deleting %s/\n",
+                               safe_fname(fname));
+               }
+               return 0;
+       }
+       if (errno == ENOENT)
                return 0;
-       if (!force_delete || !recurse
+       if ((flags & DEL_NO_RECURSE) || !force_delete || !recurse
            || (errno != ENOTEMPTY && errno != EEXIST)) {
                rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
                        full_fname(fname));
@@ -91,15 +97,30 @@ int delete_file(char *fname)
                return -1;
        }
 
+       if (!(flags & DEL_TERSE)) {
+               if (verbose)
+                       rprintf(FINFO, "deleting %s/\n", safe_fname(fname));
+               flags |= DEL_TERSE;
+       }
+
        for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
                char *dname = d_name(di);
                if (dname[0] == '.' && (dname[1] == '\0'
                    || (dname[1] == '.' && dname[2] == '\0')))
                        continue;
                pathjoin(buf, sizeof buf, fname, dname);
-               if (verbose > 0)
-                       rprintf(FINFO, "deleting %s\n", safe_fname(buf));
-               if (delete_file(buf) != 0) {
+
+               if (do_lstat(buf, &st) < 0)
+                       continue;
+               if (S_ISDIR(st.st_mode))
+                       flags |= DEL_DIR;
+               else
+                       flags &= ~DEL_DIR;
+
+               if (verbose)
+                       rprintf(FINFO, "deleting %s%s\n", safe_fname(buf),
+                               flags & DEL_DIR ? "/" : "");
+               if (delete_file(buf, flags) != 0) {
                        closedir(d);
                        return -1;
                }
@@ -113,7 +134,7 @@ int delete_file(char *fname)
 
        closedir(d);
 
-       if (do_rmdir(fname) != 0) {
+       if (do_rmdir(fname) != 0 && errno != ENOENT) {
                rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
                        full_fname(fname));
                return -1;
@@ -160,6 +181,11 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
        change_gid = preserve_gid && file->gid != GID_NONE
                && st->st_gid != file->gid;
+#if !HAVE_LCHOWN && !CHOWN_MODIFIES_SYMLINK
+       if (S_ISLNK(st->st_mode))
+               ;
+       else
+#endif
        if (change_uid || change_gid) {
                if (verbose > 2) {
                        if (change_uid) {
@@ -184,10 +210,11 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                        return 0;
                }
                /* a lchown had been done - we have to re-stat if the
-                 * destination had the setuid or setgid bits set due
-                 * to the side effect of the chown call */
+                * destination had the setuid or setgid bits set due
+                * to the side effect of the chown call */
                if (st->st_mode & (S_ISUID | S_ISGID)) {
-                       link_stat(fname, st, 0);
+                       link_stat(fname, st,
+                                 keep_dirlinks && S_ISDIR(st->st_mode));
                }
                updated = 1;
        }
@@ -233,19 +260,22 @@ void sig_int(void)
 /* finish off a file transfer, renaming the file and setting the permissions
    and ownership */
 void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
-                    int ok_to_set_time)
+                    int ok_to_set_time, int overwriting_basis)
 {
        int ret;
 
-       if (make_backups && !make_backup(fname))
-               return;
-
        if (inplace) {
                if (verbose > 2)
                        rprintf(FINFO, "finishing %s\n", fname);
                goto do_set_perms;
        }
 
+       if (make_backups && overwriting_basis && !make_backup(fname))
+               return;
+
+       /* Change permissions before putting the file into place. */
+       set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
+
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
@@ -257,11 +287,15 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
                do_unlink(fnametmp);
                return;
        }
+       if (ret == 0) {
+               /* The file was moved into place (not copied), so it's done. */
+               return;
+       }
     do_set_perms:
        set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
 }
 
 const char *who_am_i(void)
 {
-    return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+       return am_sender ? "sender" : am_generator ? "generator" : "receiver";
 }