mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-19 13:40:59 +08:00
(ftw_dir): Handle inaccessibility of toplevel dir different than implemented in last patch.
This commit is contained in:
parent
79dbd98195
commit
0e24e73d6d
13
io/ftw.c
13
io/ftw.c
@ -473,9 +473,6 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (__access (dir, R_OK) != 0)
|
||||
return -1;
|
||||
|
||||
data.maxdir = descriptors < 1 ? 1 : descriptors;
|
||||
data.actdir = 0;
|
||||
data.dirstreams = (struct dir_data **) alloca (data.maxdir
|
||||
@ -552,12 +549,10 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
|
||||
? LXSTAT (_STAT_VER, data.dirbuf, &st)
|
||||
: XSTAT (_STAT_VER, data.dirbuf, &st)) < 0)
|
||||
{
|
||||
if (errno == EACCES)
|
||||
result = (*data.func) (data.dirbuf, &st, FTW_NS, &data.ftw);
|
||||
else if (!(flags & FTW_PHYS)
|
||||
&& errno == ENOENT
|
||||
&& LXSTAT (_STAT_VER, dir, &st) == 0
|
||||
&& S_ISLNK (st.st_mode))
|
||||
if (!(flags & FTW_PHYS)
|
||||
&& errno == ENOENT
|
||||
&& LXSTAT (_STAT_VER, dir, &st) == 0
|
||||
&& S_ISLNK (st.st_mode))
|
||||
result = (*data.func) (data.dirbuf, &st, data.cvt_arr[FTW_SLN],
|
||||
&data.ftw);
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user