summaryrefslogtreecommitdiff
path: root/glob
diff options
context:
space:
mode:
Diffstat (limited to 'glob')
-rw-r--r--glob/ChangeLog5
-rw-r--r--glob/glob.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/glob/ChangeLog b/glob/ChangeLog
index 592e7a0..0cb2fcb 100644
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-08 Eli Zaretskii <eliz@is.elta.co.il>
+
+ * glob.c (prefix_array) [__MSDOS__,WINDOWS32]: Keep the trailing
+ slash unless DIRNAME is just "x:/".
+
1999-09-06 Paul D. Smith <psmith@gnu.org>
* fnmatch.c: Update to latest version from GLIBC.
diff --git a/glob/glob.c b/glob/glob.c
index 1ab5d8b..65055fb 100644
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -1105,7 +1105,7 @@ prefix_array (dirname, array, n)
#if defined __MSDOS__ || defined WINDOWS32
else if (dirlen > 1)
{
- if (dirname[dirlen - 1] == '/')
+ if (dirname[dirlen - 1] == '/' && dirname[dirlen - 2] == ':')
/* DIRNAME is "d:/". Don't prepend the slash from DIRNAME. */
--dirlen;
else if (dirname[dirlen - 1] == ':')