emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Woops, remove the code i didnt mean to commit

Browse Source
This commit is contained in:
Glenn L McGrath
2003-03-09 02:44:49 +00:00
parent d5eadea970
commit 2f8a401772
1 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
editors/sed.c
View File

@ -442,35 +442,28 @@ static char *parse_cmd_str(struct sed_cmd * const sed_cmd, const char *const cmd
error_msg_and_die("missing command"); error_msg_and_die("missing command");
sed_cmd->cmd = cmdstr[idx]; sed_cmd->cmd = cmdstr[idx];
switch (sed_cmd->cmd) {
/* if it was a single-letter command that takes no arguments (such as 'p' /* 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 */ * or 'd') all we need to do is increment the index past that command */
case 'p': if (strchr("pd=", sed_cmd->cmd)) {
case 'd':
case '=':
idx++; idx++;
break; }
/* handle (s)ubstitution command */ /* handle (s)ubstitution command */
case 's': else if (sed_cmd->cmd == 's') {
idx += parse_subst_cmd(sed_cmd, &cmdstr[idx]); idx += parse_subst_cmd(sed_cmd, &cmdstr[idx]);
break; }
/* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */ /* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
case 'a': else if (strchr("aic", sed_cmd->cmd)) {
case 'i': if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c')
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"); error_msg_and_die("only a beginning address can be specified for edit commands");
}
idx += parse_edit_cmd(sed_cmd, &cmdstr[idx]); 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");
} }
/* 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]); idx += parse_file_cmd(sed_cmd, &cmdstr[idx]);
break; }
default: else {
error_msg_and_die("Unsupported command %c", sed_cmd->cmd); error_msg_and_die("Unsupported command %c", sed_cmd->cmd);
} }