X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0f57446da7a9725a31f121084f0b2c3179b76875..9bcb25958de5e2b6a852f67122472cc66471525f:/flist.c

diff --git a/flist.c b/flist.c
index 25f5cf35..58010dd8 100644
--- a/flist.c
+++ b/flist.c
@@ -76,7 +76,7 @@ static unsigned int file_struct_len;
 static struct file_list *received_flist;
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
-static void output_flist(struct file_list *flist);
+static void output_flist(struct file_list *flist, const char *whose_list);
 
 void init_flist(void)
 {
@@ -317,7 +317,7 @@ void flist_expand(struct file_list *flist)
 	new_ptr = realloc_array(flist->files, struct file_struct *,
 				flist->malloced);
 
-	if (verbose >= 2) {
+	if (verbose >= 2 && flist->malloced != FLIST_START) {
 		rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
 		    who_am_i(),
 		    (double)sizeof flist->files[0] * flist->malloced,
@@ -335,7 +335,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	unsigned short flags;
 	static time_t modtime;
 	static mode_t mode;
-	static uint64 dev;
+	static int64 dev;
 	static dev_t rdev;
 	static uint32 rdev_major;
 	static uid_t uid;
@@ -422,11 +422,11 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 	/* We must make sure we don't send a zero flag byte or the
 	 * other end will terminate the flist transfer.  Note that
-	 * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
+	 * the use of XMIT_DEL_START on a non-dir has no meaning, so
 	 * it's harmless way to add a bit to the first flag byte. */
 	if (protocol_version >= 28) {
 		if (!flags && !S_ISDIR(mode))
-			flags |= XMIT_TOP_DIR;
+			flags |= XMIT_DEL_START;
 		if ((flags & 0xFF00) || !flags) {
 			flags |= XMIT_EXTENDED_FLAGS;
 			write_byte(f, flags);
@@ -435,7 +435,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 			write_byte(f, flags);
 	} else {
 		if (!(flags & 0xFF) && !S_ISDIR(mode))
-			flags |= XMIT_TOP_DIR;
+			flags |= XMIT_DEL_START;
 		if (!(flags & 0xFF))
 			flags |= XMIT_LONG_NAME;
 		write_byte(f, flags);
@@ -527,7 +527,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 {
 	static time_t modtime;
 	static mode_t mode;
-	static uint64 dev;
+	static int64 dev;
 	static dev_t rdev;
 	static uint32 rdev_major;
 	static uid_t uid;
@@ -645,7 +645,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	memset(bp, 0, file_struct_len);
 	bp += file_struct_len;
 
-	file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+	file->flags = flags & XMIT_DEL_START ? FLAG_DEL_START : 0;
 	file->modtime = modtime;
 	file->length = file_length;
 	file->mode = mode;
@@ -684,7 +684,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
 		flags |= XMIT_HAS_IDEV_DATA;
 	if (flags & XMIT_HAS_IDEV_DATA) {
-		uint64 inode;
+		int64 inode;
 		if (protocol_version < 26) {
 			dev = read_int(f);
 			inode = read_int(f);
@@ -1212,7 +1212,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		if (one_file_system)
 			set_filesystem(fname);
 
-		send_file_name(f, flist, fname, recurse, XMIT_TOP_DIR);
+		send_file_name(f, flist, fname, recurse, XMIT_DEL_START);
 
 		if (olddir[0]) {
 			flist_dir = NULL;
@@ -1253,7 +1253,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	}
 
 	if (verbose > 3)
-		output_flist(flist);
+		output_flist(flist, f < 0 ? "delete" : who_am_i());
 
 	if (verbose > 2)
 		rprintf(FINFO, "send_file_list done\n");
@@ -1327,7 +1327,7 @@ struct file_list *recv_file_list(int f)
 	}
 
 	if (verbose > 3)
-		output_flist(flist);
+		output_flist(flist, who_am_i());
 
 	if (list_only) {
 		int i;
@@ -1475,8 +1475,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			/* Make sure that if we unduplicate '.', that we don't
 			 * lose track of a user-specified starting point (or
 			 * else deletions will mysteriously fail with -R). */
-			if (flist->files[i]->flags & FLAG_TOP_DIR)
-				flist->files[prev_i]->flags |= FLAG_TOP_DIR;
+			if (flist->files[i]->flags & FLAG_DEL_START)
+				flist->files[prev_i]->flags |= FLAG_DEL_START;
 
 			clear_file(i, flist);
 		} else
@@ -1503,7 +1503,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 	}
 }
 
-static void output_flist(struct file_list *flist)
+static void output_flist(struct file_list *flist, const char *whose_list)
 {
 	char uidbuf[16], gidbuf[16];
 	struct file_struct *file;
@@ -1520,7 +1520,7 @@ static void output_flist(struct file_list *flist)
 		else
 			*gidbuf = '\0';
 		rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
-			who_am_i(), i, NS(file->basedir), NS(file->dirname),
+			whose_list, i, NS(file->basedir), NS(file->dirname),
 			NS(file->basename), (int)file->mode,
 			(double)file->length, uidbuf, gidbuf);
 	}