If there is no lchown(), don't try to set the user & group of a symlink.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 48aa610..8ee09c7 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -161,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
+       if (S_ISLNK(st->st_mode))
+               ;
+       else
+#endif
        if (change_uid || change_gid) {
                if (verbose > 2) {
                        if (change_uid) {
@@ -239,15 +244,18 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 {
        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 && !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);
@@ -259,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";
 }