d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

find: Allow -type d without statting everything.

Browse Source 
fts(3) detects directories even in FTS_NOSTAT mode (so it can descend into
them).

No functional change is intended, but find commands that use -type d but no
primaries that still require stat/lstat calls make considerably fewer system
calls.
This commit is contained in:
Jilles Tjoelker 2014-01-11 21:12:27 +00:00
parent fd9e2c6a4a
commit b95de98a6b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=260555
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/find/function.c
View File

@ -1552,7 +1552,12 @@ c_sparse(OPTION *option, char ***argvp __unused)
int
f_type(PLAN *plan, FTSENT *entry)
{
return (entry->fts_statp->st_mode & S_IFMT) == plan->m_data;
if (plan->m_data == S_IFDIR)
return (entry->fts_info == FTS_D || entry->fts_info == FTS_DC ||
entry->fts_info == FTS_DNR || entry->fts_info == FTS_DOT ||
entry->fts_info == FTS_DP);
else
return (entry->fts_statp->st_mode & S_IFMT) == plan->m_data;
}
PLAN *
@ -1563,7 +1568,8 @@ c_type(OPTION *option, char ***argvp)
mode_t mask;
typestring = nextarg(option, argvp);
ftsoptions &= ~FTS_NOSTAT;
if (typestring[0] != 'd')
ftsoptions &= ~FTS_NOSTAT;
switch (typestring[0]) {
case 'b':