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

find: Fix two more problems with -lname and -ilname:

Browse Source 
* Do not match symlinks that are followed because of -H or -L. This is
  explicitly documented in GNU find's info file and is like -type l.

* Fix matching symlinks in subdirectories when fts changes directories.

Also, avoid some readlink() calls on files that are obviously not symlinks
(because of fts(3) restrictions, not all of them).

MFC after:	1 week
This commit is contained in:
Jilles Tjoelker 2014-01-05 23:01:28 +00:00
parent 02c7dba919
commit e810bef741
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/find/find.1
View File

@ -31,7 +31,7 @@
.\" @(#)find.1 8.7 (Berkeley) 5/9/95
.\" $FreeBSD$
.\"
.Dd November 18, 2012
.Dd January 5, 2014
.Dt FIND 1
.Os
.Sh NAME
@ -520,6 +520,8 @@ Like
.Ic -name ,
but the contents of the symbolic link are matched instead of the file
name.
Note that this only matches broken symbolic links
if symbolic links are being followed.
This is a GNU find extension.
.It Ic -ls
This primary always evaluates to true.

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

@ -1125,7 +1125,17 @@ f_name(PLAN *plan, FTSENT *entry)
ssize_t len;
if (plan->flags & F_LINK) {
len = readlink(entry->fts_path, fn, sizeof(fn) - 1);
/*
* The below test both avoids obviously useless readlink()
* calls and ensures that symlinks with existent target do
* not match if symlinks are being followed.
* Assumption: fts will stat all symlinks that are to be
* followed and will return the stat information.
*/
if (entry->fts_info != FTS_NSOK && entry->fts_info != FTS_SL &&
entry->fts_info != FTS_SLNONE)
return 0;
len = readlink(entry->fts_accpath, fn, sizeof(fn) - 1);
if (len == -1)
return 0;
fn[len] = '\0';