Fixed failed hunks.

[rsync/rsync-patches.git] / early-chmod.diff

--- rsync.c	21 May 2004 08:43:03 -0000	1.140
+++ rsync.c	21 May 2004 08:58:01 -0000
@@ -239,6 +239,9 @@ void finish_transfer(char *fname, char *
 	if (make_backups && !make_backup(fname))
 		return;
 
+	/* Change permissions before putting the file into place. */
+	set_perms(fnametmp, file, NULL, 0);
+
 	/* move tmp file over real file */
 	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
 	if (ret < 0) {
@@ -246,7 +249,8 @@ void finish_transfer(char *fname, char *
 		    ret == -2 ? "copy" : "rename",
 		    full_fname(fnametmp), fname);
 		do_unlink(fnametmp);
-	} else {
+	} else if (ret == 1) {
+		/* The file got copied, so set the permissions again. */
 		set_perms(fname, file, NULL,
 			  ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
 	}
--- t_stub.c	15 May 2004 19:31:05 -0000	1.8
+++ t_stub.c	21 May 2004 08:58:01 -0000
@@ -26,6 +26,7 @@
  * functions, so that module test harnesses can run standalone.
  **/
 
+int am_root = 0;
 int modify_window = 0;
 int module_id = -1;
 struct exclude_list_struct server_exclude_list;
--- util.c	21 May 2004 08:40:25 -0000	1.144
+++ util.c	21 May 2004 08:58:01 -0000
@@ -29,6 +29,7 @@
 
 extern int verbose;
 extern int dry_run;
+extern int am_root;
 extern int module_id;
 extern int modify_window;
 extern struct exclude_list_struct server_exclude_list;
@@ -263,6 +264,8 @@ int copy_file(char *source, char *dest, 
 		return -1;
 	}
 
+	if (!am_root && !(mode & S_IWUSR))
+		mode |= S_IWUSR;
 	ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
 	if (ofd == -1) {
 		rsyserr(FERROR, errno, "open %s", full_fname(dest));
@@ -361,8 +364,8 @@ int robust_unlink(char *fname)
 #endif
 }
 
-/* Returns 0 on success, -1 on most errors, and -2 if we got an error
- * trying to copy the file across file systems. */
+/* Returns 0 on successful rename, 1 if we successfully copied the file
+ * across filesystems, -2 if copy_file() failed, and -1 on other errors. */
 int robust_rename(char *from, char *to, int mode)
 {
 	int tries = 4;
@@ -379,10 +382,12 @@ int robust_rename(char *from, char *to, 
 			break;
 #endif
 		case EXDEV:
+			if (!am_root && !(mode & S_IRUSR))
+				do_chmod(from, (mode & CHMOD_BITS) | S_IRUSR);
 			if (copy_file(from, to, mode) != 0)
 				return -2;
 			do_unlink(from);
-			return 0;
+			return 1;
 		default:
 			return -1;
 		}