From 2335d6254815050d3a0ae9b5a8677ec2f567b631 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Sun, 15 Feb 2015 20:20:03 -0800 Subject: 34551: Avoid adding an extra "/" to the target path in cd_try_chdir() when the current directory is "/" --- Src/builtin.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Src') diff --git a/Src/builtin.c b/Src/builtin.c index c4e4b94fd..614b17d7e 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -1093,9 +1093,11 @@ cd_try_chdir(char *pfix, char *dest, int hard) } else { int pfl = strlen(pfix); dlen = strlen(pwd); - + if (dlen == 1 && *pwd == '/') + dlen = 0; buf = zalloc(dlen + pfl + strlen(dest) + 3); - strcpy(buf, pwd); + if (dlen) + strcpy(buf, pwd); buf[dlen] = '/'; strcpy(buf + dlen + 1, pfix); buf[dlen + 1 + pfl] = '/'; -- cgit 1.4.1