From 6865f890873b97cfd2ba828b7211448f38e96d13 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 11 Nov 2008 03:51:55 +0000 Subject: [PATCH] * path.cc (normalize_win32_path): Don't add a trailing '\' if the cwd returns a path with a trailing '\'. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/path.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * path.cc (normalize_win32_path): Don't add a trailing '\' if the cwd + returns a path with a trailing '\'. + 2008-11-07 Christopher Faylor * 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++ = '\\'; } }