diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2018-04-21 01:33:13 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2018-04-21 01:33:13 +0000 |
| commit | e3a2abadc21c946c0e24f30f7944564c2d15f09d (patch) | |
| tree | 86aba15618eecb2a2c617136f9a25934b868bb49 /usr.bin | |
| parent | f3cf3e593358c2ed25b735c5407c40292049a990 (diff) | |
Notes
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/grep/util.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 7af2155439dc..557e8d7ab19a 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -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 */ |