From 3f6494e216ea635c65c8ee2b35ccda6795f4b605 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 7 May 2005 21:06:08 +0000 Subject: [PATCH] * path.cc (normalize_posix_path): Don't treat '//' specially since newer versions of bash now get this right. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/cygtls.h | 1 + winsup/cygwin/path.cc | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 721fc33f0..ed530bcb3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2005-05-07 Christopher Faylor + + * path.cc (normalize_posix_path): Don't treat '//' specially since + newer versions of bash now get this right. + 2005-05-07 Christopher Faylor * devices.cc: Regenerate with correct name for dev_netdrive_storage. diff --git a/winsup/cygwin/cygtls.h b/winsup/cygwin/cygtls.h index 9148e2cf8..18f715316 100644 --- a/winsup/cygwin/cygtls.h +++ b/winsup/cygwin/cygtls.h @@ -21,6 +21,7 @@ details. */ #define CYGTLS_INITIALIZED 0x43227 #define CYGTLS_EXCEPTION (0x43227 + true) +#define CYGTLSMAGIC "D0Ub313v31nm&G1c?"; #ifndef CYG_MAX_PATH # define CYG_MAX_PATH 260 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 2b64989ae..49aeea4b3 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -235,7 +235,7 @@ normalize_posix_path (const char *src, char *dst, char *&tail) *tail++ = '/'; } /* Two leading /'s? If so, preserve them. */ - else if (isslash (src[1]) && src[2] && !isslash (src[2])) + else if (isslash (src[1]) && !isslash (src[2])) { *tail++ = '/'; *tail++ = '/';