bsdgrep: Some light cleanup
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:
parent
69dcf941a4
commit
f3cf3e5933
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=332850
@ -308,14 +308,14 @@ procfile(const char *fn)
|
|||||||
fn = label != NULL ? label : getstr(1);
|
fn = label != NULL ? label : getstr(1);
|
||||||
f = grep_open(NULL);
|
f = grep_open(NULL);
|
||||||
} else {
|
} else {
|
||||||
if (!stat(fn, &sb)) {
|
if (stat(fn, &sb) == 0) {
|
||||||
/* Check if we need to process the file */
|
/* Check if we need to process the file */
|
||||||
s = sb.st_mode & S_IFMT;
|
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);
|
return (0);
|
||||||
if ((s == S_IFIFO || s == S_IFCHR || s == S_IFBLK
|
|
||||||
|| s == S_IFSOCK) && devbehave == DEV_SKIP)
|
|
||||||
return (0);
|
|
||||||
}
|
}
|
||||||
f = grep_open(fn);
|
f = grep_open(fn);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user