From: Wayne Davison <wayned@samba.org>
Date: Fri, 22 Apr 2005 16:45:33 +0000 (+0000)
Subject: If we're outputting a message about the remote file in a
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/2a5d5a8cc4ad251d8d29e45e4be3d9c39228715b

If we're outputting a message about the remote file in a
single-file transfer, we need to make sure that the file's
name is the generic-transfer name and not a local name.
---

diff --git a/generator.c b/generator.c
index a4a54a05..7e3ba7fb 100644
--- a/generator.c
+++ b/generator.c
@@ -723,6 +723,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if (max_size && file->length > max_size) {
 		if (verbose > 1) {
+			if (the_file_list->count == 1)
+				fname = f_name(file);
 			rprintf(FINFO, "%s is over max-size\n",
 				safe_fname(fname));
 		}
@@ -733,6 +735,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 #ifdef SUPPORT_LINKS
 		if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
 			if (verbose) {
+				if (the_file_list->count == 1)
+					fname = f_name(file);
 				rprintf(FINFO,
 					"ignoring unsafe symlink %s -> \"%s\"\n",
 					full_fname(fname),
@@ -829,6 +833,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		return;
 
 	if (!S_ISREG(file->mode)) {
+		if (the_file_list->count == 1)
+			fname = f_name(file);
 		rprintf(FINFO, "skipping non-regular file \"%s\"\n",
 			safe_fname(fname));
 		return;