diff options
Diffstat (limited to 'main/busybox/0001-grep-support-for-x-match-whole-line.patch')
| -rw-r--r-- | main/busybox/0001-grep-support-for-x-match-whole-line.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/main/busybox/0001-grep-support-for-x-match-whole-line.patch b/main/busybox/0001-grep-support-for-x-match-whole-line.patch deleted file mode 100644 index db8c4f2d9b..0000000000 --- a/main/busybox/0001-grep-support-for-x-match-whole-line.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 7a526de36684e0c794c125d552931f59a91e445c Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 23 Feb 2012 14:08:45 +0000 -Subject: [PATCH] grep: support for -x, match whole line - -Specified in POSIX. -http://pubs.opengroup.org/onlinepubs/009604499/utilities/grep.html - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - findutils/grep.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/findutils/grep.c b/findutils/grep.c -index 5f42242..6125aca 100644 ---- a/findutils/grep.c -+++ b/findutils/grep.c -@@ -85,6 +85,7 @@ - //usage: "\n -r Recurse" - //usage: "\n -i Ignore case" - //usage: "\n -w Match whole words only" -+//usage: "\n -x Match whole lines only" - //usage: "\n -F PATTERN is a literal (not regexp)" - //usage: IF_FEATURE_GREP_EGREP_ALIAS( - //usage: "\n -E PATTERN is an extended regexp" -@@ -113,7 +114,7 @@ - //usage:#define fgrep_full_usage "" - - #define OPTSTR_GREP \ -- "lnqvscFiHhe:f:Lorm:w" \ -+ "lnqvscFiHhe:f:Lorm:wx" \ - IF_FEATURE_GREP_CONTEXT("A:B:C:") \ - IF_FEATURE_GREP_EGREP_ALIAS("E") \ - IF_EXTRA_COMPAT("z") \ -@@ -138,6 +139,7 @@ enum { - OPTBIT_r, /* recurse dirs */ - OPTBIT_m, /* -m MAX_MATCHES */ - OPTBIT_w, /* -w whole word match */ -+ OPTBIT_x, /* -x whole line match */ - IF_FEATURE_GREP_CONTEXT( OPTBIT_A ,) /* -A NUM: after-match context */ - IF_FEATURE_GREP_CONTEXT( OPTBIT_B ,) /* -B NUM: before-match context */ - IF_FEATURE_GREP_CONTEXT( OPTBIT_C ,) /* -C NUM: -A and -B combined */ -@@ -160,6 +162,7 @@ enum { - OPT_r = 1 << OPTBIT_r, - OPT_m = 1 << OPTBIT_m, - OPT_w = 1 << OPTBIT_w, -+ OPT_x = 1 << OPTBIT_x, - OPT_A = IF_FEATURE_GREP_CONTEXT( (1 << OPTBIT_A)) + 0, - OPT_B = IF_FEATURE_GREP_CONTEXT( (1 << OPTBIT_B)) + 0, - OPT_C = IF_FEATURE_GREP_CONTEXT( (1 << OPTBIT_C)) + 0, -@@ -370,9 +373,12 @@ static int grep_file(FILE *file) - &gl->matched_range) >= 0 - #endif - ) { -- if (!(option_mask32 & OPT_w)) -+ if (option_mask32 & OPT_x) { -+ found = (gl->matched_range.rm_so == 0 -+ && line[gl->matched_range.rm_eo] == 0); -+ } else if (!(option_mask32 & OPT_w)) { - found = 1; -- else { -+ } else { - char c = ' '; - if (gl->matched_range.rm_so) - c = line[gl->matched_range.rm_so - 1]; --- -1.7.9.2 - |