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

The matching in -lname and -ilname are on the contents of the link

Browse Source 
itself, not on the type of the file.  As such, do a readlink to get
the symbolic link's contents and fail to match if the path isn't a
symbolic link.

Pointed out by: des@
This commit is contained in:
Warner Losh 2008-02-24 00:01:06 +00:00
parent c2602b5b06
commit acebb585f7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,9 +1087,16 @@ c_ls(OPTION *option, char ***argvp __unused)
int
f_name(PLAN *plan, FTSENT *entry)
{
if ((plan->flags & F_LINK) && !S_ISLNK(entry->fts_statp->st_mode))
return 0;
return !fnmatch(plan->c_data, entry->fts_name,
char fn[PATH_MAX];
const char *name;
if (plan->flags & F_LINK) {
name = fn;
if (readlink(entry->fts_path, fn, sizeof(fn)) == -1)
return 0;
} else
name = entry->fts_name;
return !fnmatch(plan->c_data, name,
plan->flags & F_IGNCASE ? FNM_CASEFOLD : 0);
}
@ -1102,8 +1109,6 @@ c_name(OPTION *option, char ***argvp)
pattern = nextarg(option, argvp);
new = palloc(option);
new->c_data = pattern;
if (new->flags & F_LINK)
ftsoptions &= ~FTS_NOSTAT;
return new;
}