X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b2e8a9b2931c36f11dc743b0503945d08680bb10..9ac3591366ae0048ba0fb3bba86b20851c1bfd61:/rsync.c

diff --git a/rsync.c b/rsync.c
index ca21e5e4..d78a085e 100644
--- a/rsync.c
+++ b/rsync.c
@@ -68,22 +68,23 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		st = &st2;
 	}
 
-	if (!preserve_times || S_ISLNK(st->st_mode)
-	 || (S_ISDIR(st->st_mode) && omit_dir_times))
+	if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
 		flags |= PERMS_SKIP_MTIME;
 	if (!(flags & PERMS_SKIP_MTIME)
 	    && cmp_modtime(st->st_mtime, file->modtime) != 0) {
-		if (set_modtime(fname,file->modtime) != 0) {
+		int ret = set_modtime(fname, file->modtime, st->st_mode);
+		if (ret < 0) {
 			rsyserr(FERROR, errno, "failed to set times on %s",
 				full_fname(fname));
 			return 0;
 		}
-		updated = 1;
+		if (ret == 0) /* ret == 1 if symlink could not be set */
+			updated = 1;
 	}
 
-	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
-	change_gid = preserve_gid && file->gid != GID_NONE
-		&& st->st_gid != file->gid;
+	change_uid = am_root && preserve_uid && st->st_uid != file->ids->uid;
+	change_gid = preserve_gid && file->ids->gid != GID_NONE
+		&& st->st_gid != file->ids->gid;
 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
 	if (S_ISLNK(st->st_mode))
 		;
@@ -94,19 +95,19 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 			if (change_uid) {
 				rprintf(FINFO,
 					"set uid of %s from %ld to %ld\n",
-					safe_fname(fname),
-					(long)st->st_uid, (long)file->uid);
+					fname,
+					(long)st->st_uid, (long)file->ids->uid);
 			}
 			if (change_gid) {
 				rprintf(FINFO,
 					"set gid of %s from %ld to %ld\n",
-					safe_fname(fname),
-					(long)st->st_gid, (long)file->gid);
+					fname,
+					(long)st->st_gid, (long)file->ids->gid);
 			}
 		}
 		if (do_lchown(fname,
-		    change_uid ? file->uid : st->st_uid,
-		    change_gid ? file->gid : st->st_gid) != 0) {
+		    change_uid ? file->ids->uid : st->st_uid,
+		    change_gid ? file->ids->gid : st->st_gid) != 0) {
 			/* shouldn't have attempted to change uid or gid
 			 * unless have the privilege */
 			rsyserr(FERROR, errno, "%s %s failed",
@@ -125,15 +126,16 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 	}
 
 #ifdef HAVE_CHMOD
-	if (!S_ISLNK(st->st_mode)) {
-		if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
-			updated = 1;
-			if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) {
-				rsyserr(FERROR, errno, "failed to set permissions on %s",
-					full_fname(fname));
-				return 0;
-			}
+	if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
+		int ret = do_chmod(fname, file->mode);
+		if (ret < 0) {
+			rsyserr(FERROR, errno,
+				"failed to set permissions on %s",
+				full_fname(fname));
+			return 0;
 		}
+		if (ret == 0) /* ret == 1 if symlink could not be set */
+			updated = 1;
 	}
 #endif
 
@@ -141,9 +143,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		enum logcode code = daemon_log_format_has_i || dry_run
 				  ? FCLIENT : FINFO;
 		if (updated)
-			rprintf(code, "%s\n", safe_fname(fname));
+			rprintf(code, "%s\n", fname);
 		else
-			rprintf(code, "%s is uptodate\n", safe_fname(fname));
+			rprintf(code, "%s is uptodate\n", fname);
 	}
 	return updated;
 }
@@ -173,7 +175,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 
 	if (inplace) {
 		if (verbose > 2)
-			rprintf(FINFO, "finishing %s\n", safe_fname(fname));
+			rprintf(FINFO, "finishing %s\n", fname);
 		goto do_set_perms;
 	}
 
@@ -184,15 +186,13 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 	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",
-			safe_fname(fnametmp), safe_fname(fname));
-	}
+	if (verbose > 2)
+		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
 	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
 	if (ret < 0) {
 		rsyserr(FERROR, errno, "%s %s -> \"%s\"",
-		    ret == -2 ? "copy" : "rename",
-		    full_fname(fnametmp), safe_fname(fname));
+			ret == -2 ? "copy" : "rename",
+			full_fname(fnametmp), fname);
 		do_unlink(fnametmp);
 		return;
 	}