[BusyBox-cvs] busybox/editors sed.c,1.96,1.97

Glenn McGrath bug1 at busybox.net
Sun Mar 9 02:44:52 UTC 2003


Update of /var/cvs/busybox/editors
In directory winder:/tmp/cvs-serv2125/editors

Modified Files:
	sed.c 
Log Message:
Woops, remove the code i didnt mean to commit


Index: sed.c
===================================================================
RCS file: /var/cvs/busybox/editors/sed.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- sed.c	9 Mar 2003 02:39:29 -0000	1.96
+++ sed.c	9 Mar 2003 02:44:49 -0000	1.97
@@ -442,36 +442,29 @@
 		error_msg_and_die("missing command");
 	sed_cmd->cmd = cmdstr[idx];
 
-	switch (sed_cmd->cmd) {
-		/* if it was a single-letter command that takes no arguments (such as 'p'
-		 * or 'd') all we need to do is increment the index past that command */
-		case 'p':
-		case 'd':
-		case '=':
-			idx++;
-			break;
-		/* handle (s)ubstitution command */
-		case 's':
-			idx += parse_subst_cmd(sed_cmd, &cmdstr[idx]);
-			break;
-		/* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
-		case 'a':
-		case 'i':
-		case 'c':
-			if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c') {
-				error_msg_and_die("only a beginning address can be specified for edit commands");
-			}
-			idx += parse_edit_cmd(sed_cmd, &cmdstr[idx]);
-			break;
-		/* handle file cmds: (r)ead */
-		case 'r':
-			if (sed_cmd->end_line || sed_cmd->end_match) {
-				error_msg_and_die("Command only uses one address");
-			}
-			idx += parse_file_cmd(sed_cmd, &cmdstr[idx]);
-			break;
-		default:
-			error_msg_and_die("Unsupported command %c", sed_cmd->cmd);
+	/* if it was a single-letter command that takes no arguments (such as 'p'
+	 * or 'd') all we need to do is increment the index past that command */
+	if (strchr("pd=", sed_cmd->cmd)) {
+		idx++;
+	}
+	/* handle (s)ubstitution command */
+	else if (sed_cmd->cmd == 's') {
+		idx += parse_subst_cmd(sed_cmd, &cmdstr[idx]);
+	}
+	/* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
+	else if (strchr("aic", sed_cmd->cmd)) {
+		if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c')
+			error_msg_and_die("only a beginning address can be specified for edit commands");
+		idx += parse_edit_cmd(sed_cmd, &cmdstr[idx]);
+	}
+	/* handle file cmds: (r)ead */
+	else if (sed_cmd->cmd == 'r') {
+		if (sed_cmd->end_line || sed_cmd->end_match)
+			error_msg_and_die("Command only uses one address");
+		idx += parse_file_cmd(sed_cmd, &cmdstr[idx]);
+	}
+	else {
+		error_msg_and_die("Unsupported command %c", sed_cmd->cmd);
 	}
 
 	/* give back whatever's left over */




More information about the busybox-cvs mailing list