qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(ftw_dir): Handle inaccessibility of toplevel dir different than implemented in last patch.

This commit is contained in:
Ulrich Drepper 2001-12-17 23:07:40 +00:00
parent 79dbd98195
commit 0e24e73d6d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
io/ftw.c
View File

@ -473,9 +473,6 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
return -1; return -1;
} }
if (__access (dir, R_OK) != 0)
return -1;
data.maxdir = descriptors < 1 ? 1 : descriptors; data.maxdir = descriptors < 1 ? 1 : descriptors;
data.actdir = 0; data.actdir = 0;
data.dirstreams = (struct dir_data **) alloca (data.maxdir data.dirstreams = (struct dir_data **) alloca (data.maxdir
@ -552,9 +549,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
? LXSTAT (_STAT_VER, data.dirbuf, &st) ? LXSTAT (_STAT_VER, data.dirbuf, &st)
: XSTAT (_STAT_VER, data.dirbuf, &st)) < 0) : XSTAT (_STAT_VER, data.dirbuf, &st)) < 0)
{ {
if (errno == EACCES) if (!(flags & FTW_PHYS)
result = (*data.func) (data.dirbuf, &st, FTW_NS, &data.ftw);
else if (!(flags & FTW_PHYS)
&& errno == ENOENT && errno == ENOENT
&& LXSTAT (_STAT_VER, dir, &st) == 0 && LXSTAT (_STAT_VER, dir, &st) == 0
&& S_ISLNK (st.st_mode)) && S_ISLNK (st.st_mode))