From be4f829719800b261f76ce5d7b492cf4097fbe27 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 13 Nov 2008 16:32:52 +0000 Subject: busybox: bump 1.12.x version --- package/busybox/busybox-1.12.1-grep.patch | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 package/busybox/busybox-1.12.1-grep.patch (limited to 'package/busybox/busybox-1.12.1-grep.patch') diff --git a/package/busybox/busybox-1.12.1-grep.patch b/package/busybox/busybox-1.12.1-grep.patch deleted file mode 100644 index 20404fccf..000000000 --- a/package/busybox/busybox-1.12.1-grep.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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, ':'); - } -- cgit v1.2.3