aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/generic/glob.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-05-02 18:17:07 +0000
committerUlrich Drepper <drepper@redhat.com>1999-05-02 18:17:07 +0000
commit647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56 (patch)
treee7b38467fa064bbae622aabb19beb1a47c8c88cd /sysdeps/generic/glob.c
parentc6293dee98250b6b10ccaf21ef9a1c80d4f00688 (diff)
downloadglibc-647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56.tar
glibc-647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56.tar.gz
glibc-647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56.tar.bz2
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].
Diffstat (limited to 'sysdeps/generic/glob.c')
-rw-r--r--sysdeps/generic/glob.c5
1 files changed, 3 insertions, 2 deletions
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;