/[magellan-source]/trunk/mkinitrd-magellan/busybox/findutils/grep.c

Diff of /trunk/mkinitrd-magellan/busybox/findutils/grep.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 25
  /* options */
  #define OPTSTR_GREP \
  	"lnqvscFiHhe:f:Lorm:" \
- 	USE_FEATURE_GREP_CONTEXT("A:B:C:") \
+ 	IF_FEATURE_GREP_CONTEXT("A:B:C:") \
- 	USE_FEATURE_GREP_EGREP_ALIAS("E") \
+ 	IF_FEATURE_GREP_EGREP_ALIAS("E") \
- 	USE_DESKTOP("w") \
+ 	IF_DESKTOP("w") \
+ 	IF_EXTRA_COMPAT("z") \
  	"aI"
  /* ignored: -a "assume all files to be text" */
  /* ignored: -I "assume binary files have no matches" */
-Line 49 
 enum {
+Line 51 
 enum {
  	OPTBIT_o, /* show only matching parts of lines */
  	OPTBIT_r, /* recurse dirs */
  	OPTBIT_m, /* -m MAX_MATCHES */
- 	USE_FEATURE_GREP_CONTEXT(    OPTBIT_A ,) /* -A NUM: after-match context */
+ 	IF_FEATURE_GREP_CONTEXT(    OPTBIT_A ,) /* -A NUM: after-match context */
- 	USE_FEATURE_GREP_CONTEXT(    OPTBIT_B ,) /* -B NUM: before-match context */
+ 	IF_FEATURE_GREP_CONTEXT(    OPTBIT_B ,) /* -B NUM: before-match context */
- 	USE_FEATURE_GREP_CONTEXT(    OPTBIT_C ,) /* -C NUM: -A and -B combined */
+ 	IF_FEATURE_GREP_CONTEXT(    OPTBIT_C ,) /* -C NUM: -A and -B combined */
- 	USE_FEATURE_GREP_EGREP_ALIAS(OPTBIT_E ,) /* extended regexp */
+ 	IF_FEATURE_GREP_EGREP_ALIAS(OPTBIT_E ,) /* extended regexp */
- 	USE_DESKTOP(                 OPTBIT_w ,) /* whole word match */
+ 	IF_DESKTOP(                 OPTBIT_w ,) /* whole word match */
+ 	IF_EXTRA_COMPAT(            OPTBIT_z ,) /* input is NUL terminated */
  	OPT_l = 1 << OPTBIT_l,
  	OPT_n = 1 << OPTBIT_n,
  	OPT_q = 1 << OPTBIT_q,
-Line 70 
 enum {
+Line 73 
 enum {
  	OPT_o = 1 << OPTBIT_o,
  	OPT_r = 1 << OPTBIT_r,
  	OPT_m = 1 << OPTBIT_m,
- 	OPT_A = USE_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_A)) + 0,
+ 	OPT_A = IF_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_A)) + 0,
- 	OPT_B = USE_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_B)) + 0,
+ 	OPT_B = IF_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_B)) + 0,
- 	OPT_C = USE_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_C)) + 0,
+ 	OPT_C = IF_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_C)) + 0,
- 	OPT_E = USE_FEATURE_GREP_EGREP_ALIAS((1 << OPTBIT_E)) + 0,
+ 	OPT_E = IF_FEATURE_GREP_EGREP_ALIAS((1 << OPTBIT_E)) + 0,
- 	OPT_w = USE_DESKTOP(                 (1 << OPTBIT_w)) + 0,
+ 	OPT_w = IF_DESKTOP(                 (1 << OPTBIT_w)) + 0,
+ 	OPT_z = IF_EXTRA_COMPAT(            (1 << OPTBIT_z)) + 0,
  };
  #define PRINT_FILES_WITH_MATCHES    (option_mask32 & OPT_l)
-Line 84 
 enum {
+Line 88 
 enum {
  #define PRINT_MATCH_COUNTS          (option_mask32 & OPT_c)
  #define FGREP_FLAG                  (option_mask32 & OPT_F)
  #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L)
+ #define NUL_DELIMITED               (option_mask32 & OPT_z)
  struct globals {
  	int max_matches;
-Line 100 
 struct globals {
+Line 105 
 struct globals {
  	int lines_before;
  	int lines_after;
  	char **before_buf;
- 	USE_EXTRA_COMPAT(size_t *before_buf_size;)
+ 	IF_EXTRA_COMPAT(size_t *before_buf_size;)
  	int last_line_printed;
  #endif
  	/* globals used internally */
-Line 115 
 struct globals {
+Line 120 
 struct globals {
  } while (0)
  #define max_matches       (G.max_matches         )
  #if !ENABLE_EXTRA_COMPAT
- #define reflags           (G.reflags             )
+ # define reflags          (G.reflags             )
  #else
- #define case_fold         (G.case_fold           )
+ # define case_fold        (G.case_fold           )
  /* http://www.delorie.com/gnu/docs/regex/regex_46.html */
- #define reflags           re_syntax_options
+ # define reflags           re_syntax_options
- #undef REG_NOSUB
+ # undef REG_NOSUB
- #undef REG_EXTENDED
+ # undef REG_EXTENDED
- #undef REG_ICASE
+ # undef REG_ICASE
- #define REG_NOSUB    bug:is:here /* should not be used */
+ # define REG_NOSUB    bug:is:here /* should not be used */
- #define REG_EXTENDED RE_SYNTAX_EGREP
+ /* Just RE_SYNTAX_EGREP is not enough, need to enable {n[,[m]]} too */
- #define REG_ICASE    bug:is:here /* should not be used */
+ # define REG_EXTENDED (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
+ # define REG_ICASE    bug:is:here /* should not be used */
  #endif
  #define invert_search     (G.invert_search       )
  #define print_filename    (G.print_filename      )
-Line 186 
 static void print_line(const char *line,
+Line 192 
 static void print_line(const char *line,
  		puts(line);
  #else
  		fwrite(line, 1, line_len, stdout);
- 		putchar('\n');
+ 		putchar(NUL_DELIMITED ? '\0' : '\n');
  #endif
  	}
  }
-Line 197 
 static ssize_t FAST_FUNC bb_getline(char
+Line 203 
 static ssize_t FAST_FUNC bb_getline(char
  {
  	ssize_t res_sz;
  	char *line;
+ 	int delim = (NUL_DELIMITED ? '\0' : '\n');
- 	res_sz = getline(line_ptr, line_alloc_len, file);
+ 	res_sz = getdelim(line_ptr, line_alloc_len, delim, file);
  	line = *line_ptr;
  	if (res_sz > 0) {
- 		if (line[res_sz - 1] == '\n')
+ 		if (line[res_sz - 1] == delim)
  			line[--res_sz] = '\0';
  	} else {
  		free(line); /* uclibc allocates a buffer even on EOF. WTF? */
-Line 222 
 static int grep_file(FILE *file)
+Line 229 
 static int grep_file(FILE *file)
  	char *line = NULL;
  	ssize_t line_len;
  	size_t line_alloc_len;
- #define rm_so start[0]
+ # define rm_so start[0]
- #define rm_eo end[0]
+ # define rm_eo end[0]
  #endif
  #if ENABLE_FEATURE_GREP_CONTEXT
  	int print_n_lines_after = 0;
-Line 231 
 static int grep_file(FILE *file)
+Line 238 
 static int grep_file(FILE *file)
  	int idx = 0; /* used for iteration through the circular buffer */
  #else
  	enum { print_n_lines_after = 0 };
- #endif /* ENABLE_FEATURE_GREP_CONTEXT */
+ #endif
  	while (
  #if !ENABLE_EXTRA_COMPAT
-Line 364 
 static int grep_file(FILE *file)
+Line 371 
 static int grep_file(FILE *file)
  						if (found)
  							print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
  					} else while (1) {
- 						char old = line[gl->matched_range.rm_eo];
+ 						unsigned end = gl->matched_range.rm_eo;
- 						line[gl->matched_range.rm_eo] = '\0';
+ 						char old = line[end];
+ 						line[end] = '\0';
  						print_line(line + gl->matched_range.rm_so,
- 								gl->matched_range.rm_eo - gl->matched_range.rm_so,
+ 								end - gl->matched_range.rm_so,
  								linenum, ':');
- 						line[gl->matched_range.rm_eo] = old;
+ 						if (old == '\0')
+ 							break;
+ 						line[end] = old;
  #if !ENABLE_EXTRA_COMPAT
- 						break;
+ 						if (regexec(&gl->compiled_regex, line + end,
+, &gl->matched_range, REG_NOTBOL) != 0)
+ 							break;
+ 						gl->matched_range.rm_so += end;
+ 						gl->matched_range.rm_eo += end;
  #else
  						if (re_search(&gl->compiled_regex, line, line_len,
- 								gl->matched_range.rm_eo, line_len - gl->matched_range.rm_eo,
+ 								end, line_len - end,
  								&gl->matched_range) < 0)
  							break;
  #endif
  					}
  				} else {
  					print_line(line, line_len, linenum, ':');
  				}
-Line 394 
 static int grep_file(FILE *file)
+Line 408 
 static int grep_file(FILE *file)
  				/* Add the line to the circular 'before' buffer */
  				free(before_buf[curpos]);
  				before_buf[curpos] = line;
- 				USE_EXTRA_COMPAT(before_buf_size[curpos] = line_len;)
+ 				IF_EXTRA_COMPAT(before_buf_size[curpos] = line_len;)
  				curpos = (curpos + 1) % lines_before;
  				/* avoid free(line) - we took the line */
  				line = NULL;
-Line 407 
 static int grep_file(FILE *file)
+Line 421 
 static int grep_file(FILE *file)
  #endif
  		/* Did we print all context after last requested match? */
  		if ((option_mask32 & OPT_m)
- 		 && !print_n_lines_after && nmatches == max_matches)
+ 		 && !print_n_lines_after
+ 		 && nmatches == max_matches
+ 		) {
  			break;
+ 		}
  	} /* while (read line) */
  	/* special-case file post-processing for options where we don't print line
-Line 502 
 static int grep_dir(const char *dir)
+Line 519 
 static int grep_dir(const char *dir)
  }
  int grep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int grep_main(int argc, char **argv)
+ int grep_main(int argc UNUSED_PARAM, char **argv)
  {
  	FILE *file;
  	int matched;
-Line 535 
 int grep_main(int argc, char **argv)
+Line 552 
 int grep_main(int argc, char **argv)
  		lines_after = 0;
  	} else if (lines_before > 0) {
  		before_buf = xzalloc(lines_before * sizeof(before_buf[0]));
- 		USE_EXTRA_COMPAT(before_buf_size = xzalloc(lines_before * sizeof(before_buf_size[0]));)
+ 		IF_EXTRA_COMPAT(before_buf_size = xzalloc(lines_before * sizeof(before_buf_size[0]));)
  	}
  #else
  	/* with auto sanity checks */
-Line 589 
 int grep_main(int argc, char **argv)
+Line 606 
 int grep_main(int argc, char **argv)
  	}
  	argv += optind;
- 	argc -= optind;
  	/* if we didn't get a pattern from -e and no command file was specified,
  	 * first parameter should be the pattern. no pattern, no worky */
-Line 599 
 int grep_main(int argc, char **argv)
+Line 615 
 int grep_main(int argc, char **argv)
  			bb_show_usage();
  		pattern = new_grep_list_data(*argv++, 0);
  		llist_add_to(&pattern_head, pattern);
- 		argc--;
  	}
  	/* argv[0..(argc-1)] should be names of file to grep through. If
  	 * there is more than one file to grep, we will print the filenames. */
- 	if (argc > 1)
+ 	if (argv[0] && argv[1])
  		print_filename = 1;
  	/* -H / -h of course override */
  	if (option_mask32 & OPT_H)
-Line 616 
 int grep_main(int argc, char **argv)
+Line 631 
 int grep_main(int argc, char **argv)
  	 * stdin. Otherwise, we grep through all the files specified. */
  	matched = 0;
  	do {
- 		cur_file = *argv++;
+ 		cur_file = *argv;
  		file = stdin;
  		if (!cur_file || LONE_DASH(cur_file)) {
  			cur_file = "(standard input)";
-Line 642 
 int grep_main(int argc, char **argv)
+Line 657 
 int grep_main(int argc, char **argv)
  		matched += grep_file(file);
  		fclose_if_not_stdin(file);
   grep_done: ;
- 	} while (--argc > 0);
+ 	} while (*argv && *++argv);
  	/* destroy all the elments in the pattern list */
  	if (ENABLE_FEATURE_CLEAN_UP) {

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984