X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f05f993eb72937bbd446a4758b7f0232de764889..4836c3eece276abc14a4574b350f68d8f1e429c0:/flist.c

diff --git a/flist.c b/flist.c
index 22f688d1..74834bfa 100644
--- a/flist.c
+++ b/flist.c
@@ -36,6 +36,7 @@ extern int am_server;
 extern int always_checksum;
 extern int module_id;
 extern int ignore_errors;
+extern int numeric_ids;
 
 extern int cvs_exclude;
 
@@ -73,6 +74,7 @@ static char empty_sum[MD4_SUM_LENGTH];
 static unsigned int min_file_struct_len;
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+static void output_flist(struct file_list *flist);
 
 
 void init_flist(void)
@@ -434,11 +436,13 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	if (!(flags & XMIT_SAME_MODE))
 		write_int(f, to_wire_mode(mode));
 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
-		add_uid(uid);
+		if (!numeric_ids)
+			add_uid(uid);
 		write_int(f, uid);
 	}
 	if (preserve_gid && !(flags & XMIT_SAME_GID)) {
-		add_gid(gid);
+		if (!numeric_ids)
+			add_gid(gid);
 		write_int(f, gid);
 	}
 	if (preserve_devices && IS_DEVICE(mode)) {
@@ -1190,6 +1194,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			write_batch_flist_info(flist->count, flist->files);
 	}
 
+	if (verbose > 3)
+		output_flist(flist);
+
 	if (verbose > 2)
 		rprintf(FINFO, "send_file_list done\n");
 
@@ -1265,6 +1272,9 @@ struct file_list *recv_file_list(int f)
 		}
 	}
 
+	if (verbose > 3)
+		output_flist(flist);
+
 	if (list_only) {
 		int i;
 		for (i = 0; i < flist->count; i++)
@@ -1429,18 +1439,21 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			}
 		}
 	}
+}
 
-	if (verbose <= 3)
-		return;
+static void output_flist(struct file_list *flist)
+{
+	char uidbuf[16], gidbuf[16];
+	struct file_struct *file;
+	int i;
 
 	for (i = 0; i < flist->count; i++) {
-		char uidbuf[16], gidbuf[16];
-		struct file_struct *file = flist->files[i];
+		file = flist->files[i];
 		if (am_root && preserve_uid)
 			sprintf(uidbuf, " uid=%ld", (long)file->uid);
 		else
 			*uidbuf = '\0';
-		if (preserve_gid)
+		if (preserve_gid && file->gid != GID_NONE)
 			sprintf(gidbuf, " gid=%ld", (long)file->gid);
 		else
 			*gidbuf = '\0';