/[magellan-source]/trunk/mkinitrd-magellan/busybox/editors/sed.c

Diff of /trunk/mkinitrd-magellan/busybox/editors/sed.c

Parent Directory | Revision Log | View Patch Patch

-revision 992 by niro,
Sun May 30 11:43:19 2010 UTC
+revision 1126 by niro,
Wed Aug 18 22:00:28 2010 UTC
 Line 61
  #include "libbb.h"
  #include "xregex.h"
+ enum {
+ 	OPT_in_place = 1 << 0,
+ };
  /* Each sed command turns into one of these structures. */
  typedef struct sed_cmd_s {
  	/* Ordered by alignment requirements: currently 36 bytes on x86 */
-Line 117 
 struct globals {
+Line 121 
 struct globals {
  		int idx;	/* Space used */
  		int len;	/* Space allocated */
  	} pipeline;
- };
+ } FIX_ALIASING;
  #define G (*(struct globals*)&bb_common_bufsiz1)
- void BUG_sed_globals_too_big(void);
+ struct BUG_G_too_big {
+         char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+ };
  #define INIT_G() do { \
- 	if (sizeof(struct globals) > COMMON_BUFSIZE) \
- 		BUG_sed_globals_too_big(); \
  	G.sed_cmd_tail = &G.sed_cmd_head; \
  } while (0)
-Line 385 
 static int parse_subst_cmd(sed_cmd_t *se
+Line 389 
 static int parse_subst_cmd(sed_cmd_t *se
  			break;
  		/* Comment */
  		case '#':
- 			while (substr[++idx]) /*skip all*/;
+ 			// while (substr[++idx]) continue;
+ 			idx += strlen(substr + idx); // same
  			/* Fall through */
  		/* End of command */
  		case ';':
-Line 395 
 static int parse_subst_cmd(sed_cmd_t *se
+Line 400 
 static int parse_subst_cmd(sed_cmd_t *se
  			bb_error_msg_and_die("bad option in substitution expression");
  		}
  	}
- out:
+  out:
  	/* compile the match string into a regex */
  	if (*match != '\0') {
  		/* If match is empty, we use last regex used at runtime */
-Line 562 
 static void add_cmd(const char *cmdstr)
+Line 567 
 static void add_cmd(const char *cmdstr)
  		/* last part (mandatory) will be a command */
  		if (!*cmdstr)
  			bb_error_msg_and_die("missing command");
- 		sed_cmd->cmd = *(cmdstr++);
+ 		sed_cmd->cmd = *cmdstr++;
  		cmdstr = parse_cmd_args(sed_cmd, cmdstr);
  		/* Add the command to the command array */
-Line 896 
 static void process_files(void)
+Line 901 
 static void process_files(void)
  		/* Determine if this command matches this line: */
+ 		//bb_error_msg("match1:%d", sed_cmd->in_match);
+ 		//bb_error_msg("match2:%d", (!sed_cmd->beg_line && !sed_cmd->end_line
+ 		//		&& !sed_cmd->beg_match && !sed_cmd->end_match));
+ 		//bb_error_msg("match3:%d", (sed_cmd->beg_line > 0
+ 		//	&& (sed_cmd->end_line || sed_cmd->end_match
+ 		//	    ? (sed_cmd->beg_line <= linenum)
+ 		//	    : (sed_cmd->beg_line == linenum)
+ 		//	    )
+ 		//	)
+ 		//bb_error_msg("match4:%d", (beg_match(sed_cmd, pattern_space)));
+ 		//bb_error_msg("match5:%d", (sed_cmd->beg_line == -1 && next_line == NULL));
  		/* Are we continuing a previous multi-line match? */
  		sed_cmd->in_match = sed_cmd->in_match
  			/* Or is no range necessary? */
  			|| (!sed_cmd->beg_line && !sed_cmd->end_line
  				&& !sed_cmd->beg_match && !sed_cmd->end_match)
  			/* Or did we match the start of a numerical range? */
- 			|| (sed_cmd->beg_line > 0 && (sed_cmd->beg_line <= linenum))
+ 			|| (sed_cmd->beg_line > 0
+ 			    && (sed_cmd->end_line || sed_cmd->end_match
+ 				  /* note: even if end is numeric and is < linenum too,
+ 				   * GNU sed matches! We match too */
+ 				? (sed_cmd->beg_line <= linenum)    /* N,end */
+ 				: (sed_cmd->beg_line == linenum)    /* N */
+ 				)
+ 			    )
  			/* Or does this line match our begin address regex? */
  			|| (beg_match(sed_cmd, pattern_space))
  			/* Or did we match last line of input? */
-Line 918 
 static void process_files(void)
+Line 942 
 static void process_files(void)
  		if (matched) {
  			/* once matched, "n,xxx" range is dead, disabling it */
- 			if (sed_cmd->beg_line > 0)
+ 			if (sed_cmd->beg_line > 0
+ 			 && !(option_mask32 & OPT_in_place) /* but not for -i */
+ 			) {
  				sed_cmd->beg_line = -2;
+ 			}
  			sed_cmd->in_match = !(
  				/* has the ending line come, or is this a single address command? */
  				(sed_cmd->end_line ?
-Line 965 
 static void process_files(void)
+Line 992 
 static void process_files(void)
  		}
  		/* actual sedding */
+ 		//bb_error_msg("pattern_space:'%s' next_line:'%s' cmd:%c",
+ 		//pattern_space, next_line, sed_cmd->cmd);
  		switch (sed_cmd->cmd) {
  		/* Print line number */
-Line 976 
 static void process_files(void)
+Line 1005 
 static void process_files(void)
  		case 'P':
  		{
  			char *tmp = strchr(pattern_space, '\n');
  			if (tmp) {
  				*tmp = '\0';
  				/* TODO: explain why '\n' below */
-Line 999 
 static void process_files(void)
+Line 1027 
 static void process_files(void)
  		case 'D':
  		{
  			char *tmp = strchr(pattern_space, '\n');
  			if (tmp) {
- 				tmp = xstrdup(tmp+1);
+ 				overlapping_strcpy(pattern_space, tmp + 1);
- 				free(pattern_space);
- 				pattern_space = tmp;
  				goto restart;
  			}
  		}
-Line 1048 
 static void process_files(void)
+Line 1073 
 static void process_files(void)
  		case 'r':
  		{
  			FILE *rfile;
  			rfile = fopen_for_read(sed_cmd->string);
  			if (rfile) {
  				char *line;
-Line 1096 
 static void process_files(void)
+Line 1120 
 static void process_files(void)
  		{
  			int len;
  			/* If no next line, jump to end of script and exit. */
+ 			/* http://www.gnu.org/software/sed/manual/sed.html:
+ 			 * "Most versions of sed exit without printing anything
+ 			 * when the N command is issued on the last line of
+ 			 * a file. GNU sed prints pattern space before exiting
+ 			 * unless of course the -n command switch has been
+ 			 * specified. This choice is by design."
+ 			 */
  			if (next_line == NULL) {
- 				/* Jump to end of script and exit */
+ 				//goto discard_line;
- 				free(next_line);
+ 				goto discard_commands; /* GNU behavior */
- 				next_line = NULL;
- 				goto discard_line;
- 			/* append next_line, read new next_line. */
  			}
+ 			/* Append next_line, read new next_line. */
  			len = strlen(pattern_space);
  			pattern_space = xrealloc(pattern_space, len + strlen(next_line) + 2);
  			pattern_space[len] = '\n';
-Line 1131 
 static void process_files(void)
+Line 1160 
 static void process_files(void)
  		case 'y':
  		{
  			int i, j;
  			for (i = 0; pattern_space[i]; i++) {
  				for (j = 0; sed_cmd->string[j]; j += 2) {
  					if (pattern_space[i] == sed_cmd->string[j]) {
-Line 1257 
 static void add_cmd_block(char *cmdstr)
+Line 1285 
 static void add_cmd_block(char *cmdstr)
  int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int sed_main(int argc UNUSED_PARAM, char **argv)
  {
- 	enum {
- 		OPT_in_place = 1 << 0,
- 	};
  	unsigned opt;
  	llist_t *opt_e, *opt_f;
  	int status = EXIT_SUCCESS;
-Line 1279 
 int sed_main(int argc UNUSED_PARAM, char
+Line 1304 
 int sed_main(int argc UNUSED_PARAM, char
  	opt_e = opt_f = NULL;
  	opt_complementary = "e::f::" /* can occur multiple times */
  	                    "nn"; /* count -n */
+ 	/* -i must be first, to match OPT_in_place definition */
  	opt = getopt32(argv, "irne:f:", &opt_e, &opt_f,
  			    &G.be_quiet); /* counter for -n */
  	//argc -= optind;
-Line 1320 
 int sed_main(int argc UNUSED_PARAM, char
+Line 1346 
 int sed_main(int argc UNUSED_PARAM, char
  		if (opt & OPT_in_place)
  			bb_error_msg_and_die(bb_msg_requires_arg, "-i");
  		add_input_file(stdin);
- 		process_files();
  	} else {
  		int i;
  		FILE *file;
-Line 1352 
 int sed_main(int argc UNUSED_PARAM, char
+Line 1377 
 int sed_main(int argc UNUSED_PARAM, char
  			/* Set permissions/owner of output file */
  			fstat(fileno(file), &statbuf);
+ 			/* chmod'ing AFTER chown would preserve suid/sgid bits,
+ 			 * but GNU sed 4.2.1 does not preserve them either */
  			fchmod(nonstdoutfd, statbuf.st_mode);
  			fchown(nonstdoutfd, statbuf.st_uid, statbuf.st_gid);
  			add_input_file(file);
-Line 1364 
 int sed_main(int argc UNUSED_PARAM, char
+Line 1391 
 int sed_main(int argc UNUSED_PARAM, char
  			free(G.outname);
  			G.outname = NULL;
  		}
- 		if (G.input_file_count > G.current_input_file)
+ 		/* Here, to handle "sed 'cmds' nonexistent_file" case we did:
- 			process_files();
+ 		 * if (G.current_input_file >= G.input_file_count)
+ 		 *	return status;
+ 		 * but it's not needed since process_files() works correctly
+ 		 * in this case too. */
  	}
+ 	process_files();
  	return status;
  }

 Legend:



Removed from v.992
 


changed lines


 
Added in v.1126
 Legend:



Removed from v.992
 


changed lines


 
Added in v.1126
-Removed from v.992
+Added in v.1126