Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/findutils/grep.c
- Timestamp:
- Feb 25, 2011, 9:26:54 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mindi-busybox/findutils/grep.c
r1765 r2725 6 6 * Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.org> 7 7 * 8 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.8 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 9 9 */ 10 /* BB_AUDIT SUSv3 defects - unsupported option -x .*/10 /* BB_AUDIT SUSv3 defects - unsupported option -x "match whole line only". */ 11 11 /* BB_AUDIT GNU defects - always acts as -a. */ 12 12 /* http://www.opengroup.org/onlinepubs/007904975/utilities/grep.html */ … … 15 15 * correction "-e pattern1 -e pattern2" logic and more optimizations. 16 16 * precompiled regex 17 */ 18 /* 17 * 19 18 * (C) 2006 Jac Goudsmit added -o option 20 19 */ 21 20 21 //applet:IF_GREP(APPLET(grep, _BB_DIR_BIN, _BB_SUID_DROP)) 22 //applet:IF_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, egrep)) 23 //applet:IF_FEATURE_GREP_FGREP_ALIAS(APPLET_ODDNAME(fgrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, fgrep)) 24 25 //kbuild:lib-$(CONFIG_GREP) += grep.o 26 27 //config:config GREP 28 //config: bool "grep" 29 //config: default y 30 //config: help 31 //config: grep is used to search files for a specified pattern. 32 //config: 33 //config:config FEATURE_GREP_EGREP_ALIAS 34 //config: bool "Enable extended regular expressions (egrep & grep -E)" 35 //config: default y 36 //config: depends on GREP 37 //config: help 38 //config: Enabled support for extended regular expressions. Extended 39 //config: regular expressions allow for alternation (foo|bar), grouping, 40 //config: and various repetition operators. 41 //config: 42 //config:config FEATURE_GREP_FGREP_ALIAS 43 //config: bool "Alias fgrep to grep -F" 44 //config: default y 45 //config: depends on GREP 46 //config: help 47 //config: fgrep sees the search pattern as a normal string rather than 48 //config: regular expressions. 49 //config: grep -F always works, this just creates the fgrep alias. 50 //config: 51 //config:config FEATURE_GREP_CONTEXT 52 //config: bool "Enable before and after context flags (-A, -B and -C)" 53 //config: default y 54 //config: depends on GREP 55 //config: help 56 //config: Print the specified number of leading (-B) and/or trailing (-A) 57 //config: context surrounding our matching lines. 58 //config: Print the specified number of context lines (-C). 59 22 60 #include "libbb.h" 23 61 #include "xregex.h" 24 62 63 25 64 /* options */ 65 //usage:#define grep_trivial_usage 66 //usage: "[-HhnlLoqvsriw" 67 //usage: "F" 68 //usage: IF_FEATURE_GREP_EGREP_ALIAS("E") 69 //usage: IF_EXTRA_COMPAT("z") 70 //usage: "] [-m N] " 71 //usage: IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ") 72 //usage: "PATTERN/-e PATTERN.../-f FILE [FILE]..." 73 //usage:#define grep_full_usage "\n\n" 74 //usage: "Search for PATTERN in FILEs (or stdin)\n" 75 //usage: "\nOptions:" 76 //usage: "\n -H Add 'filename:' prefix" 77 //usage: "\n -h Do not add 'filename:' prefix" 78 //usage: "\n -n Add 'line_no:' prefix" 79 //usage: "\n -l Show only names of files that match" 80 //usage: "\n -L Show only names of files that don't match" 81 //usage: "\n -c Show only count of matching lines" 82 //usage: "\n -o Show only the matching part of line" 83 //usage: "\n -q Quiet. Return 0 if PATTERN is found, 1 otherwise" 84 //usage: "\n -v Select non-matching lines" 85 //usage: "\n -s Suppress open and read errors" 86 //usage: "\n -r Recurse" 87 //usage: "\n -i Ignore case" 88 //usage: "\n -w Match whole words only" 89 //usage: "\n -F PATTERN is a literal (not regexp)" 90 //usage: IF_FEATURE_GREP_EGREP_ALIAS( 91 //usage: "\n -E PATTERN is an extended regexp" 92 //usage: ) 93 //usage: IF_EXTRA_COMPAT( 94 //usage: "\n -z Input is NUL terminated" 95 //usage: ) 96 //usage: "\n -m N Match up to N times per file" 97 //usage: IF_FEATURE_GREP_CONTEXT( 98 //usage: "\n -A N Print N lines of trailing context" 99 //usage: "\n -B N Print N lines of leading context" 100 //usage: "\n -C N Same as '-A N -B N'" 101 //usage: ) 102 //usage: "\n -e PTRN Pattern to match" 103 //usage: "\n -f FILE Read pattern from file" 104 //usage: 105 //usage:#define grep_example_usage 106 //usage: "$ grep root /etc/passwd\n" 107 //usage: "root:x:0:0:root:/root:/bin/bash\n" 108 //usage: "$ grep ^[rR]oo. /etc/passwd\n" 109 //usage: "root:x:0:0:root:/root:/bin/bash\n" 110 //usage: 111 //usage:#define egrep_trivial_usage NOUSAGE_STR 112 //usage:#define egrep_full_usage "" 113 //usage:#define fgrep_trivial_usage NOUSAGE_STR 114 //usage:#define fgrep_full_usage "" 115 26 116 #define OPTSTR_GREP \ 27 "lnqvscFiHhe:f:Lorm: " \28 USE_FEATURE_GREP_CONTEXT("A:B:C:") \29 USE_FEATURE_GREP_EGREP_ALIAS("E") \30 USE_DESKTOP("w") \117 "lnqvscFiHhe:f:Lorm:w" \ 118 IF_FEATURE_GREP_CONTEXT("A:B:C:") \ 119 IF_FEATURE_GREP_EGREP_ALIAS("E") \ 120 IF_EXTRA_COMPAT("z") \ 31 121 "aI" 32 122 /* ignored: -a "assume all files to be text" */ 33 123 /* ignored: -I "assume binary files have no matches" */ 34 35 124 enum { 36 125 OPTBIT_l, /* list matched file names only */ 37 126 OPTBIT_n, /* print line# */ 38 OPTBIT_q, /* quiet - exit( 0) of first match */127 OPTBIT_q, /* quiet - exit(EXIT_SUCCESS) of first match */ 39 128 OPTBIT_v, /* invert the match, to select non-matching lines */ 40 129 OPTBIT_s, /* suppress errors about file open errors */ … … 50 139 OPTBIT_r, /* recurse dirs */ 51 140 OPTBIT_m, /* -m MAX_MATCHES */ 52 USE_FEATURE_GREP_CONTEXT( OPTBIT_A ,) /* -A NUM: after-match context */ 53 USE_FEATURE_GREP_CONTEXT( OPTBIT_B ,) /* -B NUM: before-match context */ 54 USE_FEATURE_GREP_CONTEXT( OPTBIT_C ,) /* -C NUM: -A and -B combined */ 55 USE_FEATURE_GREP_EGREP_ALIAS(OPTBIT_E ,) /* extended regexp */ 56 USE_DESKTOP( OPTBIT_w ,) /* whole word match */ 141 OPTBIT_w, /* -w whole word match */ 142 IF_FEATURE_GREP_CONTEXT( OPTBIT_A ,) /* -A NUM: after-match context */ 143 IF_FEATURE_GREP_CONTEXT( OPTBIT_B ,) /* -B NUM: before-match context */ 144 IF_FEATURE_GREP_CONTEXT( OPTBIT_C ,) /* -C NUM: -A and -B combined */ 145 IF_FEATURE_GREP_EGREP_ALIAS(OPTBIT_E ,) /* extended regexp */ 146 IF_EXTRA_COMPAT( OPTBIT_z ,) /* input is NUL terminated */ 57 147 OPT_l = 1 << OPTBIT_l, 58 148 OPT_n = 1 << OPTBIT_n, … … 71 161 OPT_r = 1 << OPTBIT_r, 72 162 OPT_m = 1 << OPTBIT_m, 73 OPT_A = USE_FEATURE_GREP_CONTEXT( (1 << OPTBIT_A)) + 0, 74 OPT_B = USE_FEATURE_GREP_CONTEXT( (1 << OPTBIT_B)) + 0, 75 OPT_C = USE_FEATURE_GREP_CONTEXT( (1 << OPTBIT_C)) + 0, 76 OPT_E = USE_FEATURE_GREP_EGREP_ALIAS((1 << OPTBIT_E)) + 0, 77 OPT_w = USE_DESKTOP( (1 << OPTBIT_w)) + 0, 163 OPT_w = 1 << OPTBIT_w, 164 OPT_A = IF_FEATURE_GREP_CONTEXT( (1 << OPTBIT_A)) + 0, 165 OPT_B = IF_FEATURE_GREP_CONTEXT( (1 << OPTBIT_B)) + 0, 166 OPT_C = IF_FEATURE_GREP_CONTEXT( (1 << OPTBIT_C)) + 0, 167 OPT_E = IF_FEATURE_GREP_EGREP_ALIAS((1 << OPTBIT_E)) + 0, 168 OPT_z = IF_EXTRA_COMPAT( (1 << OPTBIT_z)) + 0, 78 169 }; 79 170 … … 85 176 #define FGREP_FLAG (option_mask32 & OPT_F) 86 177 #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L) 87 88 typedef unsigned char byte_t; 89 90 static int max_matches; 91 static int reflags; 92 static byte_t invert_search; 93 static byte_t print_filename; 94 static byte_t open_errors; 95 178 #define NUL_DELIMITED (option_mask32 & OPT_z) 179 180 struct globals { 181 int max_matches; 182 #if !ENABLE_EXTRA_COMPAT 183 int reflags; 184 #else 185 RE_TRANSLATE_TYPE case_fold; /* RE_TRANSLATE_TYPE is [[un]signed] char* */ 186 #endif 187 smalluint invert_search; 188 smalluint print_filename; 189 smalluint open_errors; 96 190 #if ENABLE_FEATURE_GREP_CONTEXT 97 static byte_t did_print_line; 98 static int lines_before; 99 static int lines_after; 100 static char **before_buf; 101 static int last_line_printed; 102 #endif /* ENABLE_FEATURE_GREP_CONTEXT */ 103 /* globals used internally */ 104 static llist_t *pattern_head; /* growable list of patterns to match */ 105 static const char *cur_file; /* the current file we are reading */ 191 smalluint did_print_line; 192 int lines_before; 193 int lines_after; 194 char **before_buf; 195 IF_EXTRA_COMPAT(size_t *before_buf_size;) 196 int last_line_printed; 197 #endif 198 /* globals used internally */ 199 llist_t *pattern_head; /* growable list of patterns to match */ 200 const char *cur_file; /* the current file we are reading */ 201 } FIX_ALIASING; 202 #define G (*(struct globals*)&bb_common_bufsiz1) 203 #define INIT_G() do { \ 204 struct G_sizecheck { \ 205 char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \ 206 }; \ 207 } while (0) 208 #define max_matches (G.max_matches ) 209 #if !ENABLE_EXTRA_COMPAT 210 # define reflags (G.reflags ) 211 #else 212 # define case_fold (G.case_fold ) 213 /* http://www.delorie.com/gnu/docs/regex/regex_46.html */ 214 # define reflags re_syntax_options 215 # undef REG_NOSUB 216 # undef REG_EXTENDED 217 # undef REG_ICASE 218 # define REG_NOSUB bug:is:here /* should not be used */ 219 /* Just RE_SYNTAX_EGREP is not enough, need to enable {n[,[m]]} too */ 220 # define REG_EXTENDED (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES) 221 # define REG_ICASE bug:is:here /* should not be used */ 222 #endif 223 #define invert_search (G.invert_search ) 224 #define print_filename (G.print_filename ) 225 #define open_errors (G.open_errors ) 226 #define did_print_line (G.did_print_line ) 227 #define lines_before (G.lines_before ) 228 #define lines_after (G.lines_after ) 229 #define before_buf (G.before_buf ) 230 #define before_buf_size (G.before_buf_size ) 231 #define last_line_printed (G.last_line_printed ) 232 #define pattern_head (G.pattern_head ) 233 #define cur_file (G.cur_file ) 234 106 235 107 236 typedef struct grep_list_data_t { 108 237 char *pattern; 109 regex_t preg; 110 #define PATTERN_MEM_A 1 238 /* for GNU regex, matched_range must be persistent across grep_file() calls */ 239 #if !ENABLE_EXTRA_COMPAT 240 regex_t compiled_regex; 241 regmatch_t matched_range; 242 #else 243 struct re_pattern_buffer compiled_regex; 244 struct re_registers matched_range; 245 #endif 246 #define ALLOCATED 1 111 247 #define COMPILED 2 112 248 int flg_mem_alocated_compiled; 113 249 } grep_list_data_t; 114 250 115 static void print_line(const char *line, int linenum, char decoration) 251 #if !ENABLE_EXTRA_COMPAT 252 #define print_line(line, line_len, linenum, decoration) \ 253 print_line(line, linenum, decoration) 254 #endif 255 static void print_line(const char *line, size_t line_len, int linenum, char decoration) 116 256 { 117 257 #if ENABLE_FEATURE_GREP_CONTEXT … … 121 261 return; 122 262 /* possibly print the little '--' separator */ 123 if ((lines_before || lines_after) && did_print_line && 124 last_line_printed != linenum - 1) { 263 if ((lines_before || lines_after) && did_print_line 264 && last_line_printed != linenum - 1 265 ) { 125 266 puts("--"); 126 267 } … … 134 275 printf("%i%c", linenum, decoration); 135 276 /* Emulate weird GNU grep behavior with -ov */ 136 if ((option_mask32 & (OPT_v|OPT_o)) != (OPT_v|OPT_o)) 277 if ((option_mask32 & (OPT_v|OPT_o)) != (OPT_v|OPT_o)) { 278 #if !ENABLE_EXTRA_COMPAT 137 279 puts(line); 280 #else 281 fwrite(line, 1, line_len, stdout); 282 putchar(NUL_DELIMITED ? '\0' : '\n'); 283 #endif 284 } 138 285 } 286 287 #if ENABLE_EXTRA_COMPAT 288 /* Unlike getline, this one removes trailing '\n' */ 289 static ssize_t FAST_FUNC bb_getline(char **line_ptr, size_t *line_alloc_len, FILE *file) 290 { 291 ssize_t res_sz; 292 char *line; 293 int delim = (NUL_DELIMITED ? '\0' : '\n'); 294 295 res_sz = getdelim(line_ptr, line_alloc_len, delim, file); 296 line = *line_ptr; 297 298 if (res_sz > 0) { 299 if (line[res_sz - 1] == delim) 300 line[--res_sz] = '\0'; 301 } else { 302 free(line); /* uclibc allocates a buffer even on EOF. WTF? */ 303 } 304 return res_sz; 305 } 306 #endif 139 307 140 308 static int grep_file(FILE *file) 141 309 { 142 char *line; 143 byte_t ret; 310 smalluint found; 144 311 int linenum = 0; 145 312 int nmatches = 0; 146 regmatch_t regmatch; 313 #if !ENABLE_EXTRA_COMPAT 314 char *line; 315 #else 316 char *line = NULL; 317 ssize_t line_len; 318 size_t line_alloc_len; 319 # define rm_so start[0] 320 # define rm_eo end[0] 321 #endif 147 322 #if ENABLE_FEATURE_GREP_CONTEXT 148 323 int print_n_lines_after = 0; … … 151 326 #else 152 327 enum { print_n_lines_after = 0 }; 153 #endif /* ENABLE_FEATURE_GREP_CONTEXT */ 154 155 while ((line = xmalloc_getline(file)) != NULL) { 328 #endif 329 330 while ( 331 #if !ENABLE_EXTRA_COMPAT 332 (line = xmalloc_fgetline(file)) != NULL 333 #else 334 (line_len = bb_getline(&line, &line_alloc_len, file)) >= 0 335 #endif 336 ) { 156 337 llist_t *pattern_ptr = pattern_head; 157 grep_list_data_t * gl;338 grep_list_data_t *gl = gl; /* for gcc */ 158 339 159 340 linenum++; 160 ret= 0;341 found = 0; 161 342 while (pattern_ptr) { 162 343 gl = (grep_list_data_t *)pattern_ptr->data; 163 344 if (FGREP_FLAG) { 164 ret = strstr(line, gl->pattern) != NULL; 345 found |= (((option_mask32 & OPT_i) 346 ? strcasestr(line, gl->pattern) 347 : strstr(line, gl->pattern) 348 ) != NULL); 165 349 } else { 166 /*167 * test for a postitive-assertion match (regexec returns success (0)168 * and the user did not specify invert search), or a negative-assertion169 * match (regexec returns failure (REG_NOMATCH) and the user specified170 * invert search)171 */172 350 if (!(gl->flg_mem_alocated_compiled & COMPILED)) { 173 351 gl->flg_mem_alocated_compiled |= COMPILED; 174 xregcomp(&(gl->preg), gl->pattern, reflags); 352 #if !ENABLE_EXTRA_COMPAT 353 xregcomp(&gl->compiled_regex, gl->pattern, reflags); 354 #else 355 memset(&gl->compiled_regex, 0, sizeof(gl->compiled_regex)); 356 gl->compiled_regex.translate = case_fold; /* for -i */ 357 if (re_compile_pattern(gl->pattern, strlen(gl->pattern), &gl->compiled_regex)) 358 bb_error_msg_and_die("bad regex '%s'", gl->pattern); 359 #endif 175 360 } 176 regmatch.rm_so = 0; 177 regmatch.rm_eo = 0; 178 if (regexec(&(gl->preg), line, 1, ®match, 0) == 0) { 361 #if !ENABLE_EXTRA_COMPAT 362 gl->matched_range.rm_so = 0; 363 gl->matched_range.rm_eo = 0; 364 #endif 365 if ( 366 #if !ENABLE_EXTRA_COMPAT 367 regexec(&gl->compiled_regex, line, 1, &gl->matched_range, 0) == 0 368 #else 369 re_search(&gl->compiled_regex, line, line_len, 370 /*start:*/ 0, /*range:*/ line_len, 371 &gl->matched_range) >= 0 372 #endif 373 ) { 179 374 if (!(option_mask32 & OPT_w)) 180 ret= 1;375 found = 1; 181 376 else { 182 377 char c = ' '; 183 if ( regmatch.rm_so)184 c = line[ regmatch.rm_so - 1];378 if (gl->matched_range.rm_so) 379 c = line[gl->matched_range.rm_so - 1]; 185 380 if (!isalnum(c) && c != '_') { 186 c = line[ regmatch.rm_eo];381 c = line[gl->matched_range.rm_eo]; 187 382 if (!c || (!isalnum(c) && c != '_')) 188 ret= 1;383 found = 1; 189 384 } 190 385 } 191 386 } 192 387 } 388 /* If it's non-inverted search, we can stop 389 * at first match */ 390 if (found && !invert_search) 391 goto do_found; 193 392 pattern_ptr = pattern_ptr->link; 194 393 } /* while (pattern_ptr) */ 195 394 196 if (ret ^ invert_search) { 395 if (found ^ invert_search) { 396 do_found: 197 397 /* keep track of matches */ 198 398 nmatches++; … … 206 406 * if any match is found, 207 407 * even if errors were detected" */ 208 exit( 0);408 exit(EXIT_SUCCESS); 209 409 } 210 410 /* if we're just printing filenames, we stop after the first match */ 211 411 if (PRINT_FILES_WITH_MATCHES) { 212 412 puts(cur_file); 213 /* fall thr uto "return 1" */413 /* fall through to "return 1" */ 214 414 } 215 415 /* OPT_L aka PRINT_FILES_WITHOUT_MATCHES: return early */ … … 244 444 /* now print each line in the buffer, clearing them as we go */ 245 445 while (before_buf[idx] != NULL) { 246 print_line(before_buf[idx], first_buf_entry_line_num, '-');446 print_line(before_buf[idx], before_buf_size[idx], first_buf_entry_line_num, '-'); 247 447 free(before_buf[idx]); 248 448 before_buf[idx] = NULL; … … 256 456 #endif 257 457 if (option_mask32 & OPT_o) { 258 line[regmatch.rm_eo] = '\0'; 259 print_line(line + regmatch.rm_so, linenum, ':'); 458 if (FGREP_FLAG) { 459 /* -Fo just prints the pattern 460 * (unless -v: -Fov doesnt print anything at all) */ 461 if (found) 462 print_line(gl->pattern, strlen(gl->pattern), linenum, ':'); 463 } else while (1) { 464 unsigned start = gl->matched_range.rm_so; 465 unsigned end = gl->matched_range.rm_eo; 466 unsigned len = end - start; 467 char old = line[end]; 468 line[end] = '\0'; 469 /* Empty match is not printed: try "echo test | grep -o ''" */ 470 if (len != 0) 471 print_line(line + start, len, linenum, ':'); 472 if (old == '\0') 473 break; 474 line[end] = old; 475 if (len == 0) 476 end++; 477 #if !ENABLE_EXTRA_COMPAT 478 if (regexec(&gl->compiled_regex, line + end, 479 1, &gl->matched_range, REG_NOTBOL) != 0) 480 break; 481 gl->matched_range.rm_so += end; 482 gl->matched_range.rm_eo += end; 483 #else 484 if (re_search(&gl->compiled_regex, line, line_len, 485 end, line_len - end, 486 &gl->matched_range) < 0) 487 break; 488 #endif 489 } 260 490 } else { 261 print_line(line, line num, ':');491 print_line(line, line_len, linenum, ':'); 262 492 } 263 493 } … … 267 497 /* if we need to print some context lines after the last match, do so */ 268 498 if (print_n_lines_after) { 269 print_line(line, linenum, '-');499 print_line(line, strlen(line), linenum, '-'); 270 500 print_n_lines_after--; 271 501 } else if (lines_before) { … … 273 503 free(before_buf[curpos]); 274 504 before_buf[curpos] = line; 505 IF_EXTRA_COMPAT(before_buf_size[curpos] = line_len;) 275 506 curpos = (curpos + 1) % lines_before; 276 /* avoid free(line) - we took line */507 /* avoid free(line) - we took the line */ 277 508 line = NULL; 278 509 } … … 280 511 281 512 #endif /* ENABLE_FEATURE_GREP_CONTEXT */ 513 #if !ENABLE_EXTRA_COMPAT 282 514 free(line); 283 515 #endif 284 516 /* Did we print all context after last requested match? */ 285 517 if ((option_mask32 & OPT_m) 286 && !print_n_lines_after && nmatches == max_matches) 518 && !print_n_lines_after 519 && nmatches == max_matches 520 ) { 287 521 break; 288 } 522 } 523 } /* while (read line) */ 289 524 290 525 /* special-case file post-processing for options where we don't print line … … 311 546 #if ENABLE_FEATURE_CLEAN_UP 312 547 #define new_grep_list_data(p, m) add_grep_list_data(p, m) 313 static char * 548 static char *add_grep_list_data(char *pattern, int flg_used_mem) 314 549 #else 315 550 #define new_grep_list_data(p, m) add_grep_list_data(p) 316 static char * 551 static char *add_grep_list_data(char *pattern) 317 552 #endif 318 553 { 319 grep_list_data_t *gl = x malloc(sizeof(grep_list_data_t));554 grep_list_data_t *gl = xzalloc(sizeof(*gl)); 320 555 gl->pattern = pattern; 321 556 #if ENABLE_FEATURE_CLEAN_UP 322 557 gl->flg_mem_alocated_compiled = flg_used_mem; 323 558 #else 324 gl->flg_mem_alocated_compiled = 0;559 /*gl->flg_mem_alocated_compiled = 0;*/ 325 560 #endif 326 561 return (char *)gl; … … 338 573 fopt = cur->link; 339 574 free(cur); 340 f = xfopen (ffile, "r");341 while ((line = xmalloc_ getline(f)) != NULL) {575 f = xfopen_stdin(ffile); 576 while ((line = xmalloc_fgetline(f)) != NULL) { 342 577 llist_add_to(&pattern_head, 343 new_grep_list_data(line, PATTERN_MEM_A));578 new_grep_list_data(line, ALLOCATED)); 344 579 } 345 580 } 346 581 } 347 582 348 static int file_action_grep(const char *filename, struct stat *statbuf, void* matched, int depth) 583 static int FAST_FUNC file_action_grep(const char *filename, 584 struct stat *statbuf UNUSED_PARAM, 585 void* matched, 586 int depth UNUSED_PARAM) 349 587 { 350 FILE *file = fopen (filename, "r");588 FILE *file = fopen_for_read(filename); 351 589 if (file == NULL) { 352 590 if (!SUPPRESS_ERR_MSGS) 353 bb_ perror_msg("%s", cur_file);591 bb_simple_perror_msg(filename); 354 592 open_errors = 1; 355 593 return 0; … … 375 613 } 376 614 377 int grep_main(int argc, char **argv) ;378 int grep_main(int argc , char **argv)615 int grep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 616 int grep_main(int argc UNUSED_PARAM, char **argv) 379 617 { 380 618 FILE *file; 381 619 int matched; 382 char *mopt;383 620 llist_t *fopt = NULL; 384 621 385 622 /* do normal option parsing */ 386 623 #if ENABLE_FEATURE_GREP_CONTEXT 387 char *slines_after;388 char *slines_before; 389 char *Copt;390 391 opt_complementary = "H-h: e::f::C-AB";392 getopt32(argv,624 int Copt, opts; 625 626 /* -H unsets -h; -C unsets -A,-B; -e,-f are lists; 627 * -m,-A,-B,-C have numeric param */ 628 opt_complementary = "H-h:C-AB:e::f::m+:A+:B+:C+"; 629 opts = getopt32(argv, 393 630 OPTSTR_GREP, 394 &pattern_head, &fopt, &m opt,395 & slines_after, &slines_before, &Copt);396 397 if (opt ion_mask32& OPT_C) {631 &pattern_head, &fopt, &max_matches, 632 &lines_after, &lines_before, &Copt); 633 634 if (opts & OPT_C) { 398 635 /* -C unsets prev -A and -B, but following -A or -B 399 636 may override it */ 400 if (!(option_mask32 & OPT_A)) /* not overridden */ 401 slines_after = Copt; 402 if (!(option_mask32 & OPT_B)) /* not overridden */ 403 slines_before = Copt; 404 option_mask32 |= OPT_A|OPT_B; /* for parser */ 405 } 406 if (option_mask32 & OPT_A) { 407 lines_after = xatoi_u(slines_after); 408 } 409 if (option_mask32 & OPT_B) { 410 lines_before = xatoi_u(slines_before); 637 if (!(opts & OPT_A)) /* not overridden */ 638 lines_after = Copt; 639 if (!(opts & OPT_B)) /* not overridden */ 640 lines_before = Copt; 411 641 } 412 642 /* sanity checks */ 413 if (opt ion_mask32& (OPT_c|OPT_q|OPT_l|OPT_L)) {643 if (opts & (OPT_c|OPT_q|OPT_l|OPT_L)) { 414 644 option_mask32 &= ~OPT_n; 415 645 lines_before = 0; 416 646 lines_after = 0; 417 } else if (lines_before > 0) 418 before_buf = xzalloc(lines_before * sizeof(char *)); 647 } else if (lines_before > 0) { 648 if (lines_before > INT_MAX / sizeof(long long)) 649 lines_before = INT_MAX / sizeof(long long); 650 /* overflow in (lines_before * sizeof(x)) is prevented (above) */ 651 before_buf = xzalloc(lines_before * sizeof(before_buf[0])); 652 IF_EXTRA_COMPAT(before_buf_size = xzalloc(lines_before * sizeof(before_buf_size[0]));) 653 } 419 654 #else 420 655 /* with auto sanity checks */ 421 opt_complementary = "H-h:e::f::c-n:q-n:l-n"; 656 /* -H unsets -h; -c,-q or -l unset -n; -e,-f are lists; -m N */ 657 opt_complementary = "H-h:c-n:q-n:l-n:e::f::m+"; 422 658 getopt32(argv, OPTSTR_GREP, 423 &pattern_head, &fopt, &mopt); 424 #endif 425 if (option_mask32 & OPT_m) { 426 max_matches = xatoi_u(mopt); 427 } 659 &pattern_head, &fopt, &max_matches); 660 #endif 428 661 invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */ 429 662 … … 441 674 option_mask32 |= OPT_F; 442 675 676 #if !ENABLE_EXTRA_COMPAT 443 677 if (!(option_mask32 & (OPT_o | OPT_w))) 444 678 reflags = REG_NOSUB; 445 446 if (ENABLE_FEATURE_GREP_EGREP_ALIAS && 447 (applet_name[0] == 'e' || (option_mask32 & OPT_E))) 679 #endif 680 681 if (ENABLE_FEATURE_GREP_EGREP_ALIAS 682 && (applet_name[0] == 'e' || (option_mask32 & OPT_E)) 683 ) { 448 684 reflags |= REG_EXTENDED; 449 450 if (option_mask32 & OPT_i) 685 } 686 #if ENABLE_EXTRA_COMPAT 687 else { 688 reflags = RE_SYNTAX_GREP; 689 } 690 #endif 691 692 if (option_mask32 & OPT_i) { 693 #if !ENABLE_EXTRA_COMPAT 451 694 reflags |= REG_ICASE; 695 #else 696 int i; 697 case_fold = xmalloc(256); 698 for (i = 0; i < 256; i++) 699 case_fold[i] = (unsigned char)i; 700 for (i = 'a'; i <= 'z'; i++) 701 case_fold[i] = (unsigned char)(i - ('a' - 'A')); 702 #endif 703 } 452 704 453 705 argv += optind; 454 argc -= optind; 455 456 /* if we didn't get a pattern from a -e and no command file was specified, 457 * argv[optind] should be the pattern. no pattern, no worky */ 706 707 /* if we didn't get a pattern from -e and no command file was specified, 708 * first parameter should be the pattern. no pattern, no worky */ 458 709 if (pattern_head == NULL) { 459 710 char *pattern; … … 462 713 pattern = new_grep_list_data(*argv++, 0); 463 714 llist_add_to(&pattern_head, pattern); 464 argc--; 465 } 466 467 /* argv[(optind)..(argc-1)] should be names of file to grep through. If 715 } 716 717 /* argv[0..(argc-1)] should be names of file to grep through. If 468 718 * there is more than one file to grep, we will print the filenames. */ 469 if (arg c > 1)719 if (argv[0] && argv[1]) 470 720 print_filename = 1; 471 721 /* -H / -h of course override */ … … 477 727 /* If no files were specified, or '-' was specified, take input from 478 728 * stdin. Otherwise, we grep through all the files specified. */ 479 if (argc == 0)480 argc++;481 729 matched = 0; 482 while (argc--){483 cur_file = *argv ++;730 do { 731 cur_file = *argv; 484 732 file = stdin; 485 if (!cur_file || (*cur_file == '-' && !cur_file[1])) {733 if (!cur_file || LONE_DASH(cur_file)) { 486 734 cur_file = "(standard input)"; 487 735 } else { … … 496 744 } 497 745 /* else: fopen(dir) will succeed, but reading won't */ 498 file = fopen (cur_file, "r");746 file = fopen_for_read(cur_file); 499 747 if (file == NULL) { 500 748 if (!SUPPRESS_ERR_MSGS) 501 bb_ perror_msg("%s",cur_file);749 bb_simple_perror_msg(cur_file); 502 750 open_errors = 1; 503 751 continue; … … 507 755 fclose_if_not_stdin(file); 508 756 grep_done: ; 509 } 757 } while (*argv && *++argv); 510 758 511 759 /* destroy all the elments in the pattern list */ … … 513 761 while (pattern_head) { 514 762 llist_t *pattern_head_ptr = pattern_head; 515 grep_list_data_t *gl = 516 (grep_list_data_t *)pattern_head_ptr->data; 763 grep_list_data_t *gl = (grep_list_data_t *)pattern_head_ptr->data; 517 764 518 765 pattern_head = pattern_head->link; 519 if ( (gl->flg_mem_alocated_compiled & PATTERN_MEM_A))766 if (gl->flg_mem_alocated_compiled & ALLOCATED) 520 767 free(gl->pattern); 521 if ( (gl->flg_mem_alocated_compiled & COMPILED))522 regfree(& (gl->preg));768 if (gl->flg_mem_alocated_compiled & COMPILED) 769 regfree(&gl->compiled_regex); 523 770 free(gl); 524 771 free(pattern_head_ptr); … … 528 775 if (open_errors) 529 776 return 2; 530 return !matched; /* invert return value 0 = success, 1 = failed */777 return !matched; /* invert return value: 0 = success, 1 = failed */ 531 778 }
Note:
See TracChangeset
for help on using the changeset viewer.