diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-10-06 18:52:02 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-10-06 18:52:02 +0000 |
| commit | a42c6373c48faf054a535279136ae142a14789c6 (patch) | |
| tree | 669cad313a94e6b56b32fb26f816c9efe691d1a4 /package/busybox/busybox-1.12.1-grep.patch | |
| parent | 242895ef6371dfb1c8a5d867e592598992b0bd01 (diff) | |
| download | buildroot-novena-a42c6373c48faf054a535279136ae142a14789c6.tar.gz buildroot-novena-a42c6373c48faf054a535279136ae142a14789c6.zip | |
busybox: 1.12.1 grep fix
Diffstat (limited to 'package/busybox/busybox-1.12.1-grep.patch')
| -rw-r--r-- | package/busybox/busybox-1.12.1-grep.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.12.1-grep.patch b/package/busybox/busybox-1.12.1-grep.patch new file mode 100644 index 000000000..20404fccf --- /dev/null +++ b/package/busybox/busybox-1.12.1-grep.patch @@ -0,0 +1,27 @@ +--- busybox-1.12.1/findutils/grep.c Sun Sep 28 20:04:28 2008 ++++ busybox-1.12.1-grep/findutils/grep.c Wed Oct 1 00:45:49 2008 +@@ -363,12 +363,22 @@ + * (unless -v: -Fov doesnt print anything at all) */ + if (found) + print_line(gl->pattern, strlen(gl->pattern), linenum, ':'); +- } else { ++ } else while (1) { ++ char old = line[gl->matched_range.rm_eo]; + line[gl->matched_range.rm_eo] = '\0'; + print_line(line + gl->matched_range.rm_so, + gl->matched_range.rm_eo - gl->matched_range.rm_so, + linenum, ':'); +- } ++ line[gl->matched_range.rm_eo] = old; ++#if !ENABLE_EXTRA_COMPAT ++ break; ++#else ++ if (re_search(&gl->compiled_regex, line, line_len, ++ gl->matched_range.rm_eo, line_len - gl->matched_range.rm_eo, ++ &gl->matched_range) < 0) ++ break; ++#endif ++ } + } else { + print_line(line, line_len, linenum, ':'); + } |