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

bsdgrep: More trivial cleanup/style cleanup

Browse Source 
We can avoid branching for these easily reduced patterns
This commit is contained in:
Kyle Evans 2018-04-21 01:33:13 +00:00
parent f3cf3e5933
commit e3a2abadc2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=332851
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,11 +110,8 @@ file_matching(const char *fname)
for (unsigned int i = 0; i < fpatterns; ++i) {
if (fnmatch(fpattern[i].pat, fname, 0) == 0 ||
fnmatch(fpattern[i].pat, fname_base, 0) == 0) {
if (fpattern[i].mode == EXCL_PAT) {
ret = false;
break;
} else
ret = true;
ret = (fpattern[i].mode != EXCL_PAT);
break;
}
}
free(fname_buf);
@ -129,13 +126,8 @@ dir_matching(const char *dname)
ret = dinclude ? false : true;
for (unsigned int i = 0; i < dpatterns; ++i) {
if (dname != NULL &&
fnmatch(dpattern[i].pat, dname, 0) == 0) {
if (dpattern[i].mode == EXCL_PAT)
return (false);
else
ret = true;
}
if (dname != NULL && fnmatch(dpattern[i].pat, dname, 0) == 0)
return (dpattern[i].mode != EXCL_PAT);
}
return (ret);
}
@ -164,7 +156,6 @@ grep_tree(char **argv)
break;
default:
fts_flags = FTS_LOGICAL;
}
fts_flags |= FTS_NOSTAT | FTS_NOCHDIR;
@ -193,7 +184,7 @@ grep_tree(char **argv)
case FTS_DC:
/* Print a warning for recursive directory loop */
warnx("warning: %s: recursive directory loop",
p->fts_path);
p->fts_path);
break;
default:
/* Check for file exclusion/inclusion */