svn commit: trunk/busybox/editors

[vda at busybox.net]

Author: vda
Date: 2006-10-01 14:37:40 -0700 (Sun, 01 Oct 2006)
New Revision: 16287

Log:
sed: -e options were handled in reverse order. fix that.


Modified:
   trunk/busybox/editors/sed.c


Changeset:
Modified: trunk/busybox/editors/sed.c
===================================================================
--- trunk/busybox/editors/sed.c	2006-10-01 21:05:12 UTC (rev 16286)
+++ trunk/busybox/editors/sed.c	2006-10-01 21:37:40 UTC (rev 16287)
@@ -1084,6 +1084,29 @@
 	free(temp);
 }
 
+static void add_cmds_link(llist_t *opt_e)
+{
+	if (!opt_e) return;
+	add_cmds_link(opt_e->link);
+	add_cmd_block(opt_e->data);
+	free(opt_e);
+}
+
+static void add_files_link(llist_t *opt_f)
+{
+	char *line;
+	FILE *cmdfile;
+	if (!opt_f) return;
+	add_files_link(opt_f->link);
+	cmdfile = xfopen(opt_f->data, "r");
+	while ((line = bb_get_chomped_line_from_file(cmdfile)) != NULL) {
+		add_cmd(line);
+		free(line);
+	}
+	xprint_and_close_file(cmdfile);
+	free(opt_f);
+}
+
 int sed_main(int argc, char **argv)
 {
 	unsigned long opt;
@@ -1112,27 +1135,12 @@
 	if (opt & 0x2) bbg.regex_type|=REG_EXTENDED; // -r
 	if (opt & 0x4) bbg.be_quiet++; // -n
 	if (opt & 0x8) { // -e
-		while (opt_e) {
-			llist_t *cur = opt_e;
-			add_cmd_block(cur->data);
-			opt_e = cur->link;
-			free(cur);
-		}
+		/* getopt_ulflags reverses order of arguments, handle it */
+		add_cmds_link(opt_e);
 	}
 	if (opt & 0x10) { // -f
-		while (opt_f) {
-			llist_t *cur = opt_f;
-			FILE *cmdfile;
-			char *line;
-			cmdfile = xfopen(cur->data, "r");
-			while ((line = bb_get_chomped_line_from_file(cmdfile)) != NULL) {
-				add_cmd(line);
-				free(line);
-			}
-			xprint_and_close_file(cmdfile);
-			opt_f = cur->link;
-			free(cur);
-		}
+		/* getopt_ulflags reverses order of arguments, handle it */
+		add_files_link(opt_f);
 	}
 	/* if we didn't get a pattern from -e or -f, use argv[optind] */
 	if(!(opt & 0x18)) {