From d95d8c5393988702112b8fcd154683150227cb7a Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 9 Jan 2009 05:18:02 +0000 Subject: * include/sys/cygwin.h (CW_SETERRNO): Define. * external.cc (CW_SETERRNO): Implement. * include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 192 to reflect the above change. * path.cc (path_prefix_p): Treat X: as equivalent to x:. * mkglobals_h: Remove unneeded #define. * spawn.cc (spawn_guts): Avoid overly wordy initialization to zero. --- winsup/cygwin/path.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/path.cc') diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index da96cde01..f736be496 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -169,8 +169,20 @@ path_prefix_p (const char *path1, const char *path2, int len1, return isdirsep (path2[0]) && !isdirsep (path2[1]); if (isdirsep (path2[len1]) || path2[len1] == 0 || path1[len1 - 1] == ':') - return caseinsensitive ? strncasematch (path1, path2, len1) - : !strncmp (path1, path2, len1); + { + if (len1 < 2 || (path1[1] != ':') || (path2[1] != ':')) + /* nothing */; + else if (tolower (*path1) != tolower(*path2)) + return 0; + else + { + path1 += 2; + path2 += 2; + len1 -= 2; + } + return caseinsensitive ? strncasematch (path1, path2, len1) + : !strncmp (path1, path2, len1); + } return 0; } -- cgit v1.2.3