diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2010-09-01 09:24:37 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-05 22:51:37 +0200 |
| commit | f661b023ab0bff19575992126d4646c8c8de7d6c (patch) | |
| tree | 978e9b94f01a063c1a08f2483d5a53dbea8ee3f5 /package/busybox/busybox-1.17.1/busybox-1.17.1-grep.patch | |
| parent | bfa9e9e2bd8b4d3f0dcc29c461ba5b061bc5d738 (diff) | |
| download | buildroot-novena-f661b023ab0bff19575992126d4646c8c8de7d6c.tar.gz buildroot-novena-f661b023ab0bff19575992126d4646c8c8de7d6c.zip | |
busybox: Bump to 1.17.2
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/busybox/busybox-1.17.1/busybox-1.17.1-grep.patch')
| -rw-r--r-- | package/busybox/busybox-1.17.1/busybox-1.17.1-grep.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/package/busybox/busybox-1.17.1/busybox-1.17.1-grep.patch b/package/busybox/busybox-1.17.1/busybox-1.17.1-grep.patch deleted file mode 100644 index f8fc25d3f..000000000 --- a/package/busybox/busybox-1.17.1/busybox-1.17.1-grep.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urpN busybox-1.17.1/findutils/grep.c busybox-1.17.1-grep/findutils/grep.c ---- busybox-1.17.1/findutils/grep.c 2010-07-06 04:25:54.000000000 +0200 -+++ busybox-1.17.1-grep/findutils/grep.c 2010-08-23 02:37:08.000000000 +0200 -@@ -461,15 +461,19 @@ static int grep_file(FILE *file) - if (found) - print_line(gl->pattern, strlen(gl->pattern), linenum, ':'); - } else while (1) { -+ unsigned start = gl->matched_range.rm_so; - unsigned end = gl->matched_range.rm_eo; -+ unsigned len = end - start; - char old = line[end]; - line[end] = '\0'; -- print_line(line + gl->matched_range.rm_so, -- end - gl->matched_range.rm_so, -- linenum, ':'); -+ /* Empty match is not printed: try "echo test | grep -o ''" */ -+ if (len != 0) -+ print_line(line + start, len, linenum, ':'); - if (old == '\0') - break; - line[end] = old; -+ if (len == 0) -+ end++; - #if !ENABLE_EXTRA_COMPAT - if (regexec(&gl->compiled_regex, line + end, - 1, &gl->matched_range, REG_NOTBOL) != 0) -diff -urpN busybox-1.17.1/testsuite/grep.tests busybox-1.17.1-grep/testsuite/grep.tests ---- busybox-1.17.1/testsuite/grep.tests 2010-07-06 04:25:54.000000000 +0200 -+++ busybox-1.17.1-grep/testsuite/grep.tests 2010-08-23 02:37:08.000000000 +0200 -@@ -98,5 +98,9 @@ testing "grep -o does not loop forever" - 'grep -o "[^/]*$"' \ - "test\n" \ - "" "/var/test\n" -+testing "grep -o does not loop forever on zero-length match" \ -+ 'grep -o "" | head -n1' \ -+ "" \ -+ "" "test\n" - - exit $FAILCOUNT |