diff options
| author | Paul Smith <psmith@gnu.org> | 1999-09-11 05:44:53 +0000 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 1999-09-11 05:44:53 +0000 |
| commit | 125e5ece0a816990494dd8960a0ff02a4401050b (patch) | |
| tree | 68b837ce83b7fed701b2c4228f37b4d8ac481352 /glob | |
| parent | 732f90b68bb09440234267085b933eeb82dbf0e2 (diff) | |
| download | make-125e5ece0a816990494dd8960a0ff02a4401050b.tar.gz | |
* Various cleanups for release.
Diffstat (limited to 'glob')
| -rw-r--r-- | glob/ChangeLog | 5 | ||||
| -rw-r--r-- | glob/glob.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/glob/ChangeLog b/glob/ChangeLog index 592e7a05..0cb2fcb1 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 1ab5d8b6..65055fb7 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] == ':') |