X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4844449a5d4336a39fba52e3f14aaf467e61e8b7..37c817eb8159366539d4a9c69bd78e74d4941c06:/flist.c

diff --git a/flist.c b/flist.c
index a9d4c2c9..ee18d4d9 100644
--- a/flist.c
+++ b/flist.c
@@ -342,7 +342,8 @@ static void flist_expand(struct file_list *flist)
 		}
 
 		if (verbose >= 2) {
-			rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
+			rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
+				who_am_i(),
 				(double)sizeof(flist->files[0])
 				* flist->malloced,
 				(new_ptr == flist->files) ? " not" : "");
@@ -781,8 +782,10 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 
       skip_excludes:
 
-	if (verbose > 2)
-		rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level);
+	if (verbose > 2) {
+		rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
+			who_am_i(), fname, exclude_level);
+	}
 
 	file = new(struct file_struct);
 	if (!file)
@@ -1097,8 +1100,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 				flist_dir = lastdir;
 				flist_dir_len = lastdir_len;
 			} else {
-				if (lastdir)
-					free(lastdir);
 				flist_dir = lastdir = strdup(dir);
 				flist_dir_len = lastdir_len = strlen(dir);
 			}
@@ -1416,8 +1417,9 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		return;
 
 	for (i = 0; i < flist->count; i++) {
-		rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n",
-			(long) getpid(), i,
+		rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n",
+			who_am_i(), i,
+			NS(flist->files[i]->basedir),
 			NS(flist->files[i]->dirname),
 			NS(flist->files[i]->basename),
 			(int) flist->files[i]->mode,