X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7352b8736b94a7cb375cc2789fba6728d5c35955..9935066b704bcf2e6e48dac85cb1b4047d8f439d:/rsync.c

diff --git a/rsync.c b/rsync.c
index ad9293c4..78fedab6 100644
--- a/rsync.c
+++ b/rsync.c
@@ -26,6 +26,9 @@ extern int verbose;
 extern int dry_run;
 extern int preserve_times;
 extern int am_root;
+extern int am_server;
+extern int am_sender;
+extern int am_generator;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_perms;
@@ -93,7 +96,7 @@ int delete_file(char *fname)
 		if (strcmp(dname,".") == 0
 		    || strcmp(dname,"..") == 0)
 			continue;
-		snprintf(buf, sizeof(buf), "%s/%s", fname, dname);
+		pathjoin(buf, sizeof buf, fname, dname);
 		if (verbose > 0)
 			rprintf(FINFO,"deleting %s\n", buf);
 		if (delete_file(buf) != 0) {
@@ -152,15 +155,28 @@ 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_t)-1
+	change_gid = preserve_gid && file->gid != GID_NONE
 		&& st->st_gid != file->gid;
 	if (change_uid || change_gid) {
+		if (verbose > 2 && !dry_run) {
+			if (change_uid) {
+				rprintf(FINFO,
+				    "set uid of %s from %ld to %ld\n",
+				    fname, (long)st->st_uid, (long)file->uid);
+			}
+			if (change_gid) {
+				rprintf(FINFO,
+				    "set gid of %s from %ld to %ld\n",
+				    fname, (long)st->st_gid, (long)file->gid);
+			}
+		}
 		if (do_lchown(fname,
 			      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 */
-			rprintf(FERROR, "chown %s failed: %s\n",
+			rprintf(FERROR, "%s %s failed: %s\n",
+				change_uid ? "chown" : "chgrp",
 				full_fname(fname), strerror(errno));
 			return 0;
 		}
@@ -239,3 +255,8 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
 		set_perms(fname,file,NULL,0);
 	}
 }
+
+const char *who_am_i(void)
+{
+    return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+}