diff options
author | Ulrich Drepper <drepper@redhat.com> | 1999-11-01 03:04:49 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1999-11-01 03:04:49 +0000 |
commit | ea1bfb072cb7480fb47c1b7b72f08eb1ec1171ee (patch) | |
tree | 32ebae4b7569f5a847293e684012859a3b9299b5 /sysdeps | |
parent | 56bd58554f695b46acb80e11f8253198ab33c718 (diff) | |
download | glibc-ea1bfb072cb7480fb47c1b7b72f08eb1ec1171ee.tar glibc-ea1bfb072cb7480fb47c1b7b72f08eb1ec1171ee.tar.gz glibc-ea1bfb072cb7480fb47c1b7b72f08eb1ec1171ee.tar.bz2 glibc-ea1bfb072cb7480fb47c1b7b72f08eb1ec1171ee.zip |
Update.
1999-09-11 Paul Eggert <eggert@twinsun.com>
* posix/glob.h (glob): If #defining to glob64, do this before
declaring it, so that all declarations and uses match, and do not
declare glob64, to avoid a declaration clash.
(globfree): Likewise with globfree64.
1999-09-08 Eli Zaretskii <eliz@is.elta.co.il>
* sysdeps/generic/glob.c (prefix_array) [__MSDOS__,WINDOWS32]:
Keep the trailing slash unless DIRNAME is just "x:/".
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/glob.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c index 1ab5d8b629..65055fb7f8 100644 --- a/sysdeps/generic/glob.c +++ b/sysdeps/generic/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] == ':') |