From: Wayne Davison <wayned@samba.org>
Date: Fri, 22 Apr 2011 22:51:55 +0000 (-0700)
Subject: Avoid adding a slash to path '/'.
X-Git-Tag: v3.0.9pre1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ef38b0d1b5efcd857b9e2f7608f288bd0439785;p=thirdparty%2Frsync.git

Avoid adding a slash to path '/'.
---

diff --git a/util.c b/util.c
index a694fdec..2991fd22 100644
--- a/util.c
+++ b/util.c
@@ -1024,8 +1024,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';