Added a "overwriting_basis" arg to finish_transfer().

[rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 472e1ef2e7880fc1de46da6b6a903907dbc113e5..1b28c35e49267e1b5be02839642a4f12f58517b6 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;
@@ -98,7 +99,7 @@ int delete_file(char *fname)
                        continue;
                pathjoin(buf, sizeof buf, fname, dname);
                if (verbose > 0)
-                       rprintf(FINFO, "deleting %s\n", buf);
+                       rprintf(FINFO, "deleting %s\n", safe_fname(buf));
                if (delete_file(buf) != 0) {
                        closedir(d);
                        return -1;
@@ -160,6 +161,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) {
@@ -187,7 +193,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                  * 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 +240,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 +267,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";
 }