X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/58a37ed34a601dc828c910ccb2effc1f4a57e03d..ae87c43452b2b2d81d4e9c66153948d4ba334b5d:/flist.c

diff --git a/flist.c b/flist.c
index 1fd20f58..717d268f 100644
--- a/flist.c
+++ b/flist.c
@@ -1336,6 +1336,9 @@ static void add_dirs_to_tree(int parent_ndx, int start, int end)
 	qsort(dir_flist->sorted + start, end - start + 1,
 	      sizeof dir_flist->sorted[0], (int (*)())file_compare);
 
+	if (verbose > 3)
+		output_flist(dir_flist);
+
 	for (i = start; i <= end; i++) {
 		struct file_struct *file = dir_flist->sorted[i];
 		if (!(file->flags & FLAG_XFER_DIR)
@@ -2228,7 +2231,7 @@ static void clean_flist(struct file_list *flist, int strip_root)
 				if (verbose > 1) {
 					rprintf(FINFO,
 					    "removing duplicate name %s from file list (%d)\n",
-					    f_name(file, fbuf), drop);
+					    f_name(file, fbuf), drop + flist->ndx_start);
 				}
 				/* Make sure we don't lose track of a user-specified
 				 * top directory. */
@@ -2370,9 +2373,12 @@ static void output_flist(struct file_list *flist)
 			trail = S_ISDIR(file->mode) ? "/" : "";
 		} else
 			root = dir = slash = name = trail = "";
-		rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
-			who, i, root, dir, slash, name, trail, (int)file->mode,
-			(double)F_LENGTH(file), uidbuf, gidbuf, file->flags);
+		rprintf(FINFO,
+			"[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
+			who, i + flist->ndx_start,
+			root, dir, slash, name, trail,
+			(int)file->mode, (double)F_LENGTH(file),
+			uidbuf, gidbuf, file->flags);
 	}
 }