diff options
author | Christopher Faylor <me@cgf.cx> | 2008-11-11 06:51:55 +0300 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2008-11-11 06:51:55 +0300 |
commit | 6865f890873b97cfd2ba828b7211448f38e96d13 (patch) | |
tree | f533194365d6be361ea1cb4a3c2a488ca6610682 | |
parent | dc74da050c86c0f3be47510b36bd2ee15ed13e8a (diff) |
* path.cc (normalize_win32_path): Don't add a trailing '\' if the cwd returns a
path with a trailing '\'.
-rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/cygwin/path.cc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 5e7870a4a..c8755b873 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2008-11-10 Christopher Faylor <me+cygwin@cgf.cx> + + * path.cc (normalize_win32_path): Don't add a trailing '\' if the cwd + returns a path with a trailing '\'. + 2008-11-07 Christopher Faylor <me+cygwin@cgf.cx> * pthread.cc (pthread_mutex::_unlock): Avoid unlocking a mutex if the diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 1f9028a4d..d0eab0298 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -1346,7 +1346,8 @@ normalize_win32_path (const char *src, char *dst, char *&tail) else { tail = strchr (tail, '\0'); - *tail++ = '\\'; + if (tail[-1] != '\\') + *tail++ = '\\'; } } |