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].
This commit is contained in:
Ulrich Drepper 1999-05-02 18:17:07 +00:00
parent c6293dee98
commit 647361287d
2 changed files with 9 additions and 2 deletions

View File

@ -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

View File

@ -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;