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

bsdgrep: Some light cleanup

Browse Source 
There's no point checking for a bunch of file modes if we're not a
practicing believer of DIR_SKIP or DEV_SKIP.

This also reduces some style violations that were particularly ugly looking
when browsing through.
This commit is contained in:
Kyle Evans 2018-04-21 01:02:35 +00:00
parent 69dcf941a4
commit f3cf3e5933
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=332850
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/grep/util.c
View File

@ -308,14 +308,14 @@ procfile(const char *fn)
fn = label != NULL ? label : getstr(1);
f = grep_open(NULL);
} else {
if (!stat(fn, &sb)) {
if (stat(fn, &sb) == 0) {
/* Check if we need to process the file */
s = sb.st_mode & S_IFMT;
if (s == S_IFDIR && dirbehave == DIR_SKIP)
if (dirbehave == DIR_SKIP && s == S_IFDIR)
return (0);
if (devbehave == DEV_SKIP && (s == S_IFIFO ||
s == S_IFCHR || s == S_IFBLK || s == S_IFSOCK))
return (0);
if ((s == S_IFIFO || s == S_IFCHR || s == S_IFBLK
|| s == S_IFSOCK) && devbehave == DEV_SKIP)
return (0);
}
f = grep_open(fn);
}