diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-05-02 18:17:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-05-02 18:17:07 +0000 |
| commit | 647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56 (patch) | |
| tree | e7b38467fa064bbae622aabb19beb1a47c8c88cd | |
| parent | c6293dee98250b6b10ccaf21ef9a1c80d4f00688 (diff) | |
| download | glibc-647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56.tar.gz glibc-647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56.tar.xz glibc-647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56.zip | |
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].
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/generic/glob.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 2ff6f163e5..3d1cf99d55 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 d624655718..fe09f50a10 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; |