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

sed: allow 'w' cmd to use two address form

Browse Source 
function                                             old     new   delta
add_cmd                                             1101    1094      -7

Signed-off-by: Mimi Li <felloak@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Mimi Li 2012-07-24 13:20:12 +02:00 committed by Denys Vlasenko
parent dbed6c4b46
commit 37a79c092e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editors/sed.c
View File

@ -53,7 +53,9 @@
* Todo: * Todo:
* - Create a wrapper around regex to make libc's regex conform with sed * - Create a wrapper around regex to make libc's regex conform with sed
* *
* Reference http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html * Reference
* http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html
* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html
*/ */
//usage:#define sed_trivial_usage //usage:#define sed_trivial_usage
@ -492,8 +494,10 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
} }
/* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */ /* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
else if (idx <= IDX_c) { /* a,i,c */ else if (idx <= IDX_c) { /* a,i,c */
if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c') if (idx < IDX_c) { /* a,i */
bb_error_msg_and_die("only a beginning address can be specified for edit commands"); if (sed_cmd->end_line || sed_cmd->end_match)
bb_error_msg_and_die("command '%c' uses only one address", sed_cmd->cmd);
}
for (;;) { for (;;) {
if (*cmdstr == '\n' || *cmdstr == '\\') { if (*cmdstr == '\n' || *cmdstr == '\\') {
cmdstr++; cmdstr++;
@ -510,8 +514,10 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
} }
/* handle file cmds: (r)ead */ /* handle file cmds: (r)ead */
else if (idx <= IDX_w) { /* r,w */ else if (idx <= IDX_w) { /* r,w */
if (idx < IDX_w) { /* r */
if (sed_cmd->end_line || sed_cmd->end_match) if (sed_cmd->end_line || sed_cmd->end_match)
bb_error_msg_and_die("command only uses one address"); bb_error_msg_and_die("command '%c' uses only one address", sed_cmd->cmd);
}
cmdstr += parse_file_cmd(/*sed_cmd,*/ cmdstr, &sed_cmd->string); cmdstr += parse_file_cmd(/*sed_cmd,*/ cmdstr, &sed_cmd->string);
if (sed_cmd->cmd == 'w') { if (sed_cmd->cmd == 'w') {
sed_cmd->sw_file = xfopen_for_write(sed_cmd->string); sed_cmd->sw_file = xfopen_for_write(sed_cmd->string);