summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/path.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2004-04-08 01:33:00 +0000
committerChristopher Faylor <me@cgf.cx>2004-04-08 01:33:00 +0000
commit284a55c33e0739e57436e02460b7997c3e70253f (patch)
treecfae135925740356218556dba9621227972872db /winsup/cygwin/path.cc
parent49294f009e78e45182a0af439d53fd108eee9a47 (diff)
downloadcygnal-284a55c33e0739e57436e02460b7997c3e70253f.tar.gz
cygnal-284a55c33e0739e57436e02460b7997c3e70253f.tar.bz2
cygnal-284a55c33e0739e57436e02460b7997c3e70253f.zip
* path.cc (path_prefix_p): Optimize test order.
Diffstat (limited to 'winsup/cygwin/path.cc')
-rw-r--r--winsup/cygwin/path.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 7ed2ee778..0ece42dd9 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -161,10 +161,10 @@ path_prefix_p (const char *path1, const char *path2, int len1)
if (len1 == 0)
return isdirsep (path2[0]) && !isdirsep (path2[1]);
- if (!pathnmatch (path1, path2, len1))
- return 0;
+ if (isdirsep (path2[len1]) || path2[len1] == 0 || path1[len1 - 1] == ':')
+ return pathnmatch (path1, path2, len1);
- return isdirsep (path2[len1]) || path2[len1] == 0 || path1[len1 - 1] == ':';
+ return 0;
}
/* Return non-zero if paths match in first len chars.