From a13d3b3d77e61d1b31145b6a145325bae065c144 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 22 Apr 2011 15:51:55 -0700
Subject: [PATCH] Avoid adding a slash to path '/'.

---
 util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/util.c b/util.c
index 3f611d15..5200a9aa 100644
--- a/util.c
+++ b/util.c
@@ -1062,8 +1062,9 @@ int change_dir(const char *dir, int set_path_only)
 			errno = ENAMETOOLONG;
 			return 0;
 		}
-		curr_dir[curr_dir_len] = '/';
-		memcpy(curr_dir + curr_dir_len + 1, dir, len + 1);
+		if (!(curr_dir_len && curr_dir[curr_dir_len-1] == '/'))
+			curr_dir[curr_dir_len++] = '/';
+		memcpy(curr_dir + curr_dir_len, dir, len + 1);
 
 		if (!set_path_only && chdir(curr_dir)) {
 			curr_dir[curr_dir_len] = '\0';
-- 
2.34.1