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 2ff6f163e508690875741cad58f8f7542880a9a6..3d1cf99d553facbd0cccc3355fda816262be9b24 100644 (file)
--- 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 d624655718965b41dbf91ab5e8aed4e24878c683..fe09f50a109f48ae78907ca65d73fd56ba2f324f 100644 (file)
--- 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;