X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a3f6dbdf5c9d03a0dd84f6b5e37063f2d18fddcc..5e1f082d0c0af5fdb8096023772eb4f5013f78a0:/util.c

diff --git a/util.c b/util.c
index 8dd1b1c3..afe1f884 100644
--- a/util.c
+++ b/util.c
@@ -1021,7 +1021,7 @@ char *full_fname(const char *fn)
 	if (*fn == '/')
 		p1 = p2 = "";
 	else {
-		p1 = curr_dir;
+		p1 = curr_dir + module_dirlen;
 		for (p2 = p1; *p2 == '/'; p2++) {}
 		if (*p2)
 			p2 = "/";
@@ -1030,17 +1030,11 @@ char *full_fname(const char *fn)
 		m1 = " (in ";
 		m2 = lp_name(module_id);
 		m3 = ")";
-		if (p1 == curr_dir) {
-			if (!lp_use_chroot(module_id)) {
-				char *p = lp_path(module_id);
-				if (*p != '/' || p[1])
-					p1 += strlen(p);
-			}
-		}
 	} else
 		m1 = m2 = m3 = "";
 
-	asprintf(&result, "\"%s%s%s\"%s%s%s", p1, p2, fn, m1, m2, m3);
+	if (asprintf(&result, "\"%s%s%s\"%s%s%s", p1, p2, fn, m1, m2, m3) <= 0)
+		out_of_memory("full_fname");
 
 	return result;
 }