diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-08 15:41:27 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-08 15:41:27 +0000 |
| commit | 9acfed2d14cb8b2310fd3bb56ceed589a9348912 (patch) | |
| tree | 0d9ae4a050a8994e7173bfc9ddf2202068799636 | |
| parent | 65e14b458892a150681c42bb5837acf68f2d9b60 (diff) | |
| download | busybox-w32-9acfed2d14cb8b2310fd3bb56ceed589a9348912.tar.gz busybox-w32-9acfed2d14cb8b2310fd3bb56ceed589a9348912.tar.bz2 busybox-w32-9acfed2d14cb8b2310fd3bb56ceed589a9348912.zip | |
grep: selection done by FEATURE_GREP_EGREP_ALIAS was broken, fix.
(Maxime Bizon <mbizon@freebox.fr> (Freebox))
| -rw-r--r-- | findutils/grep.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 59508607f..75425b4df 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
| @@ -48,11 +48,11 @@ enum { | |||
| 48 | OPTBIT_L, | 48 | OPTBIT_L, |
| 49 | OPTBIT_o, | 49 | OPTBIT_o, |
| 50 | OPTBIT_r, | 50 | OPTBIT_r, |
| 51 | USE_FEATURE_GREP_CONTEXT(OPTBIT_A ,) | 51 | USE_FEATURE_GREP_CONTEXT( OPTBIT_A ,) |
| 52 | USE_FEATURE_GREP_CONTEXT(OPTBIT_B ,) | 52 | USE_FEATURE_GREP_CONTEXT( OPTBIT_B ,) |
| 53 | USE_FEATURE_GREP_CONTEXT(OPTBIT_C ,) | 53 | USE_FEATURE_GREP_CONTEXT( OPTBIT_C ,) |
| 54 | USE_FEATURE_GREP_CONTEXT(OPTBIT_E ,) | 54 | USE_FEATURE_GREP_EGREP_ALIAS(OPTBIT_E ,) |
| 55 | USE_DESKTOP( OPTBIT_w ,) | 55 | USE_DESKTOP( OPTBIT_w ,) |
| 56 | OPT_l = 1 << OPTBIT_l, | 56 | OPT_l = 1 << OPTBIT_l, |
| 57 | OPT_n = 1 << OPTBIT_n, | 57 | OPT_n = 1 << OPTBIT_n, |
| 58 | OPT_q = 1 << OPTBIT_q, | 58 | OPT_q = 1 << OPTBIT_q, |
| @@ -68,19 +68,19 @@ enum { | |||
| 68 | OPT_L = 1 << OPTBIT_L, | 68 | OPT_L = 1 << OPTBIT_L, |
| 69 | OPT_o = 1 << OPTBIT_o, | 69 | OPT_o = 1 << OPTBIT_o, |
| 70 | OPT_r = 1 << OPTBIT_r, | 70 | OPT_r = 1 << OPTBIT_r, |
| 71 | OPT_A = USE_FEATURE_GREP_CONTEXT((1 << OPTBIT_A)) + 0, | 71 | OPT_A = USE_FEATURE_GREP_CONTEXT( (1 << OPTBIT_A)) + 0, |
| 72 | OPT_B = USE_FEATURE_GREP_CONTEXT((1 << OPTBIT_B)) + 0, | 72 | OPT_B = USE_FEATURE_GREP_CONTEXT( (1 << OPTBIT_B)) + 0, |
| 73 | OPT_C = USE_FEATURE_GREP_CONTEXT((1 << OPTBIT_C)) + 0, | 73 | OPT_C = USE_FEATURE_GREP_CONTEXT( (1 << OPTBIT_C)) + 0, |
| 74 | OPT_E = USE_FEATURE_GREP_CONTEXT((1 << OPTBIT_E)) + 0, | 74 | OPT_E = USE_FEATURE_GREP_EGREP_ALIAS((1 << OPTBIT_E)) + 0, |
| 75 | OPT_w = USE_DESKTOP( (1 << OPTBIT_w)) + 0, | 75 | OPT_w = USE_DESKTOP( (1 << OPTBIT_w)) + 0, |
| 76 | }; | 76 | }; |
| 77 | 77 | ||
| 78 | #define PRINT_FILES_WITH_MATCHES (option_mask32 & OPT_l) | 78 | #define PRINT_FILES_WITH_MATCHES (option_mask32 & OPT_l) |
| 79 | #define PRINT_LINE_NUM (option_mask32 & OPT_n) | 79 | #define PRINT_LINE_NUM (option_mask32 & OPT_n) |
| 80 | #define BE_QUIET (option_mask32 & OPT_q) | 80 | #define BE_QUIET (option_mask32 & OPT_q) |
| 81 | #define SUPPRESS_ERR_MSGS (option_mask32 & OPT_s) | 81 | #define SUPPRESS_ERR_MSGS (option_mask32 & OPT_s) |
| 82 | #define PRINT_MATCH_COUNTS (option_mask32 & OPT_c) | 82 | #define PRINT_MATCH_COUNTS (option_mask32 & OPT_c) |
| 83 | #define FGREP_FLAG (option_mask32 & OPT_F) | 83 | #define FGREP_FLAG (option_mask32 & OPT_F) |
| 84 | #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L) | 84 | #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L) |
| 85 | 85 | ||
| 86 | typedef unsigned char byte_t; | 86 | typedef unsigned char byte_t; |