diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-12-04 09:24:01 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-12-04 09:24:01 +0100 |
| commit | bf4d2d862e0b140febabd5897c78f54ef8773a67 (patch) | |
| tree | ed7e8e24f28166801c02bb632a152f031d2a3c36 /package/busybox/busybox-1.15.2-grep.patch | |
| parent | edee1d78ab38f51844df256615146d522ace6425 (diff) | |
| download | buildroot-novena-bf4d2d862e0b140febabd5897c78f54ef8773a67.tar.gz buildroot-novena-bf4d2d862e0b140febabd5897c78f54ef8773a67.zip | |
busybox: 1.15.2 patches
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/busybox/busybox-1.15.2-grep.patch')
| -rw-r--r-- | package/busybox/busybox-1.15.2-grep.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.15.2-grep.patch b/package/busybox/busybox-1.15.2-grep.patch new file mode 100644 index 000000000..cc7d6761b --- /dev/null +++ b/package/busybox/busybox-1.15.2-grep.patch @@ -0,0 +1,25 @@ +diff -urpN busybox-1.15.2/findutils/grep.c busybox-1.15.2-grep/findutils/grep.c +--- busybox-1.15.2/findutils/grep.c 2009-09-26 15:14:57.000000000 +0200 ++++ busybox-1.15.2-grep/findutils/grep.c 2009-12-04 02:46:43.000000000 +0100 +@@ -377,6 +377,8 @@ static int grep_file(FILE *file) + print_line(line + gl->matched_range.rm_so, + end - gl->matched_range.rm_so, + linenum, ':'); ++ if (old == '\0') ++ break; + line[end] = old; + #if !ENABLE_EXTRA_COMPAT + if (regexec(&gl->compiled_regex, line + end, +diff -urpN busybox-1.15.2/testsuite/grep.tests busybox-1.15.2-grep/testsuite/grep.tests +--- busybox-1.15.2/testsuite/grep.tests 2009-09-26 15:14:57.000000000 +0200 ++++ busybox-1.15.2-grep/testsuite/grep.tests 2009-12-04 02:46:43.000000000 +0100 +@@ -90,4 +90,9 @@ testing "grep -E -o prints all matches" + "00:19:3E:00:AA:5E\n00:1D:60:3D:3A:FB\n00:22:43:49:FB:AA\n" \ + "" "00:19:3E:00:AA:5E 00:1D:60:3D:3A:FB 00:22:43:49:FB:AA\n" + ++testing "grep -o does not loop forever" \ ++ 'grep -o "[^/]*$"' \ ++ "test\n" \ ++ "" "/var/test\n" ++ + exit $FAILCOUNT |