From 647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 2 May 1999 18:17:07 +0000 Subject: [PATCH] Update. 1999-05-02 Ulrich Drepper * sysdeps/generic/glob.c (glob_in_dir): It's no error if opendir fails on a file. Reported by Sergei Ivanov [PR libc/1032]. --- ChangeLog | 6 ++++++ sysdeps/generic/glob.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ff6f163e50..3d1cf99d553 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-05-02 Ulrich Drepper + + * sysdeps/generic/glob.c (glob_in_dir): It's no error if opendir + fails on a file. + Reported by Sergei Ivanov [PR libc/1032]. + 1998-03-30 Joel Klecker * 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; -- 2.47.3