From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 2 May 1999 18:17:07 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_1_1~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56;p=thirdparty%2Fglibc.git

Update.

1999-05-02  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/glob.c (glob_in_dir): It's no error if opendir
	fails on a file.
	Reported by Sergei Ivanov <svivanov@pdmi.ras.ru> [PR libc/1032].
---

diff --git a/ChangeLog b/ChangeLog
index 2ff6f163e50..3d1cf99d553 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-05-02  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/generic/glob.c (glob_in_dir): It's no error if opendir
+	fails on a file.
+	Reported by Sergei Ivanov <svivanov@pdmi.ras.ru> [PR libc/1032].
+
 1998-03-30  Joel Klecker  <espy@debian.org>
 
 	* sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c
index d6246557189..fe09f50a109 100644
--- a/sysdeps/generic/glob.c
+++ b/sysdeps/generic/glob.c
@@ -1272,8 +1272,9 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 		    : (__ptr_t) opendir (directory));
 	  if (stream == NULL)
 	    {
-	      if ((errfunc != NULL && (*errfunc) (directory, errno))
-		  || (flags & GLOB_ERR))
+	      if (errno != ENOTDIR
+		  && ((errfunc != NULL && (*errfunc) (directory, errno))
+		      || (flags & GLOB_ERR)))
 		return GLOB_ABORTED;
 	      nfound = 0;
 	      meta = 0;