From 7a0415cfd70a02b2280d27556c6c54cef1c86e1a Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Thu, 15 Apr 1999 18:18:42 +0000 Subject: zsh-3.1.5-pws-11 --- Src/builtin.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Src/builtin.c') diff --git a/Src/builtin.c b/Src/builtin.c index fc9b113ca..c042537f4 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -1072,12 +1072,14 @@ fixdir(char *src) *dest = '\0'; return; } - if (dest > d0 + 1 && src[0] == '.' && src[1] == '.' && + if (src[0] == '.' && src[1] == '.' && (src[2] == '\0' || src[2] == '/')) { - /* remove a foo/.. combination */ - for (dest--; dest > d0 + 1 && dest[-1] != '/'; dest--); - if (dest[-1] != '/') - dest--; + if (dest > d0 + 1) { + /* remove a foo/.. combination */ + for (dest--; dest > d0 + 1 && dest[-1] != '/'; dest--); + if (dest[-1] != '/') + dest--; + } src++; while (*++src == '/'); } else if (src[0] == '.' && (src[1] == '/' || src[1] == '\0')) { -- cgit 1.4.1