From bc83274ad67fe65b3bd42691e46111bf2b5a41dd Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 23 Feb 2005 02:56:42 +0000
Subject: [PATCH] - Fixed a problem with full_fname() when curr_dir was "/". -
 Made full_fname() consistently output a leading "/" for   module paths no
 matter if chroot is in use or not.

---
 util.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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 = "";
 
-- 
2.34.1