Author: delphij
Date: Mon Dec 11 05:21:48 2017
New Revision: 326763
URL: https://svnweb.freebsd.org/changeset/base/326763
Log:
MFC r325723:
find(1): Don't treat statfs() error as fatal in f_fstype, which can happen
when a directory is removed in the middle of find.
Instead of a full err(), allow find to continue, plus print a warning with
exitstatus set when appropriate.
Reported by: 100.chksetuid via gordon
Reviewed by: jilles
Modified:
stable/10/usr.bin/find/function.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/find/function.c
==============================================================================
--- stable/10/usr.bin/find/function.c Mon Dec 11 05:19:45 2017
(r326762)
+++ stable/10/usr.bin/find/function.c Mon Dec 11 05:21:48 2017
(r326763)
@@ -896,8 +896,13 @@ f_fstype(PLAN *plan, FTSENT *entry)
} else
p = NULL;
- if (statfs(entry->fts_accpath, &sb))
- err(1, "%s", entry->fts_accpath);
+ if (statfs(entry->fts_accpath, &sb)) {
+ if (!ignore_readdir_race || errno != ENOENT) {
+ warn("statfs: %s", entry->fts_accpath);
+ exitstatus = 1;
+ }
+ return 0;
+ }
if (p) {
p[0] = save[0];
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
