diff options
| author | Ron Yorston <rmy@pobox.com> | 2018-04-02 09:24:14 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2018-04-02 09:24:14 +0100 |
| commit | 34a68d327b42c3c700e84cd475496985782290b1 (patch) | |
| tree | 99bfe59cca420d26f01e81a7f41763f71b44d22c /findutils | |
| parent | aff3c5bd7b6bdcfb97f63153ab839c5f55f16a12 (diff) | |
| parent | e84212f8346741a2d4a04b40639c44fe519cf5a7 (diff) | |
| download | busybox-w32-34a68d327b42c3c700e84cd475496985782290b1.tar.gz busybox-w32-34a68d327b42c3c700e84cd475496985782290b1.tar.bz2 busybox-w32-34a68d327b42c3c700e84cd475496985782290b1.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index fc6de4b69..88de0d4ef 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
| @@ -352,7 +352,7 @@ static int grep_file(FILE *file) | |||
| 352 | goto opt_f_not_found; | 352 | goto opt_f_not_found; |
| 353 | } else | 353 | } else |
| 354 | if (option_mask32 & OPT_w) { | 354 | if (option_mask32 & OPT_w) { |
| 355 | char c = (match != str) ? match[-1] : ' '; | 355 | char c = (match != line) ? match[-1] : ' '; |
| 356 | if (!isalnum(c) && c != '_') { | 356 | if (!isalnum(c) && c != '_') { |
| 357 | c = match[strlen(gl->pattern)]; | 357 | c = match[strlen(gl->pattern)]; |
| 358 | if (!c || (!isalnum(c) && c != '_')) | 358 | if (!c || (!isalnum(c) && c != '_')) |