From ea1bfb072cb7480fb47c1b7b72f08eb1ec1171ee Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 1 Nov 1999 03:04:49 +0000 Subject: Update. 1999-09-11 Paul Eggert * 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 * sysdeps/generic/glob.c (prefix_array) [__MSDOS__,WINDOWS32]: Keep the trailing slash unless DIRNAME is just "x:/". --- sysdeps/generic/glob.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sysdeps/generic/glob.c') 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] == ':') -- cgit 1.4.1