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

Tiny refactoring in fts to eliminate a warning.

This commit is contained in:
Roland McGrath 2014-10-20 15:32:26 -07:00
parent e436eb790f
commit 6ab1d1ea96
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-10-20 Roland McGrath <roland@hack.frob.com>
* io/fts.c (dirent_not_directory): New function.
(fts_build): Call it.
2014-10-20 Roland McGrath <roland@hack.frob.com> 2014-10-20 Roland McGrath <roland@hack.frob.com>
* nptl/version.c (__nptl_main): Use normal __write rather than * nptl/version.c (__nptl_main): Use normal __write rather than

16
io/fts.c
View File

@ -561,6 +561,16 @@ fts_children(sp, instr)
return (sp->fts_child); return (sp->fts_child);
} }
static inline int
dirent_not_directory(const struct dirent *dp)
{
#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
return dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN;
#else
return 0;
#endif
}
/* /*
* This is the tricky part -- do not casually change *anything* in here. The * This is the tricky part -- do not casually change *anything* in here. The
* idea is to build the linked list of entries that are used by fts_children * idea is to build the linked list of entries that are used by fts_children
@ -759,11 +769,7 @@ mem1: saved_errno = errno;
p->fts_info = FTS_NSOK; p->fts_info = FTS_NSOK;
p->fts_accpath = cur->fts_accpath; p->fts_accpath = cur->fts_accpath;
} else if (nlinks == 0 } else if (nlinks == 0
#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE || (nostat && dirent_not_directory(dp))) {
|| (nostat &&
dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
#endif
) {
p->fts_accpath = p->fts_accpath =
ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name; ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
p->fts_info = FTS_NSOK; p->fts_info = FTS_NSOK;