X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/732537212b24a7567e510ac58092a25e5329f457..32cbfe7b17ba8ec661fc27fd773909709d100e8a:/util.c

diff --git a/util.c b/util.c
index fc670afc..a43cfb0b 100644
--- a/util.c
+++ b/util.c
@@ -922,25 +922,21 @@ char *full_fname(const char *fn)
 		p1 = p2 = "";
 	else {
 		p1 = curr_dir;
-		p2 = "/";
+		for (p2 = p1; *p2 == '/'; p2++) {}
+		if (*p2)
+			p2 = "/";
 	}
 	if (module_id >= 0) {
 		m1 = " (in ";
 		m2 = lp_name(module_id);
 		m3 = ")";
-		if (*p1) {
+		if (p1 == curr_dir) {
 			if (!lp_use_chroot(module_id)) {
 				char *p = lp_path(module_id);
 				if (*p != '/' || p[1])
 					p1 += strlen(p);
 			}
-			if (!*p1)
-				p2++;
-			else
-				p1++;
 		}
-		else
-			fn++;
 	} else
 		m1 = m2 = m3 = "";