diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-12-12 22:17:44 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-12-12 22:17:44 +0100 |
commit | 3e97eeb408a1107b0ffacc6ba39682428c4598f1 (patch) | |
tree | f6f7df81821d543bef855f961a76b09e79d49855 /findutils | |
parent | 8cbc300d083001bccac4f33bf61b9dc97f29cb04 (diff) | |
download | busybox-w32-3e97eeb408a1107b0ffacc6ba39682428c4598f1.tar.gz busybox-w32-3e97eeb408a1107b0ffacc6ba39682428c4598f1.tar.bz2 busybox-w32-3e97eeb408a1107b0ffacc6ba39682428c4598f1.zip |
apply post-1.15.2 fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
-rw-r--r-- | findutils/grep.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 776a629be..dc26b5f07 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -377,6 +377,8 @@ static int grep_file(FILE *file) | |||
377 | print_line(line + gl->matched_range.rm_so, | 377 | print_line(line + gl->matched_range.rm_so, |
378 | end - gl->matched_range.rm_so, | 378 | end - gl->matched_range.rm_so, |
379 | linenum, ':'); | 379 | linenum, ':'); |
380 | if (old == '\0') | ||
381 | break; | ||
380 | line[end] = old; | 382 | line[end] = old; |
381 | #if !ENABLE_EXTRA_COMPAT | 383 | #if !ENABLE_EXTRA_COMPAT |
382 | if (regexec(&gl->compiled_regex, line + end, | 384 | if (regexec(&gl->compiled_regex, line + end, |