X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ce37eb2d8331e1e951349487de7fcd16cd5afce6..3d061653890e25fd95186d521a2d1dc5ea4d76e7:/rsync.c

diff --git a/rsync.c b/rsync.c
index 78fedab6..f91cda59 100644
--- a/rsync.c
+++ b/rsync.c
@@ -143,22 +143,21 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 	if (preserve_times && !S_ISLNK(st->st_mode) &&
 	    cmp_modtime(st->st_mtime, file->modtime) != 0) {
 		/* don't complain about not setting times on directories
-		   because some filesystems can't do it */
+		 * because some filesystems can't do it */
 		if (set_modtime(fname,file->modtime) != 0 &&
 		    !S_ISDIR(st->st_mode)) {
 			rprintf(FERROR, "failed to set times on %s: %s\n",
 				full_fname(fname), strerror(errno));
 			return 0;
-		} else {
-			updated = 1;
 		}
+		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;
 	if (change_uid || change_gid) {
-		if (verbose > 2 && !dry_run) {
+		if (verbose > 2) {
 			if (change_uid) {
 				rprintf(FINFO,
 				    "set uid of %s from %ld to %ld\n",
@@ -171,18 +170,18 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 			}
 		}
 		if (do_lchown(fname,
-			      change_uid?file->uid:st->st_uid,
-			      change_gid?file->gid:st->st_gid) != 0) {
+		    change_uid ? file->uid : st->st_uid,
+		    change_gid ? file->gid : st->st_gid) != 0) {
 			/* shouldn't have attempted to change uid or gid
-			     unless have the privilege */
+			 * unless have the privilege */
 			rprintf(FERROR, "%s %s failed: %s\n",
-				change_uid ? "chown" : "chgrp",
-				full_fname(fname), strerror(errno));
+			    change_uid ? "chown" : "chgrp",
+			    full_fname(fname), strerror(errno));
 			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);
 		}
@@ -231,25 +230,17 @@ void sig_int(void)
    and ownership */
 void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
 {
+	int ret;
+
 	if (make_backups && !make_backup(fname))
 		return;
 
 	/* move tmp file over real file */
-	if (robust_rename(fnametmp,fname) != 0) {
-		if (errno == EXDEV) {
-			/* rename failed on cross-filesystem link.
-			   Copy the file instead. */
-			if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) {
-				rprintf(FERROR, "copy %s -> \"%s\": %s\n",
-					full_fname(fnametmp), fname,
-					strerror(errno));
-			} else {
-				set_perms(fname,file,NULL,0);
-			}
-		} else {
-			rprintf(FERROR,"rename %s -> \"%s\": %s\n",
-				full_fname(fnametmp), fname, strerror(errno));
-		}
+	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
+	if (ret < 0) {
+		rprintf(FERROR, "%s %s -> \"%s\": %s\n",
+		    ret == -2 ? "copy" : "rename",
+		    full_fname(fnametmp), fname, strerror(errno));
 		do_unlink(fnametmp);
 	} else {
 		set_perms(fname,file,NULL,0);