Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-28 05:29:59 +00:00
Code Issues Projects Releases Wiki Activity

sed: fix nested {} case

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-04-20 04:00:03 -04:00
parent 96a1833231
commit f2c16edf99
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/sed.c
View File

@ -936,7 +936,15 @@ static void process_files(void)
/* Skip blocks of commands we didn't match */ /* Skip blocks of commands we didn't match */
if (sed_cmd->cmd == '{') { if (sed_cmd->cmd == '{') {
if (sed_cmd->invert ? matched : !matched) { if (sed_cmd->invert ? matched : !matched) {
while (sed_cmd->cmd != '}') { unsigned nest_cnt = 0;
while (1) {
if (sed_cmd->cmd == '{')
nest_cnt++;
if (sed_cmd->cmd == '}') {
nest_cnt--;
if (nest_cnt == 0)
break;
}
sed_cmd = sed_cmd->next; sed_cmd = sed_cmd->next;
if (!sed_cmd) if (!sed_cmd)
bb_error_msg_and_die("unterminated {"); bb_error_msg_and_die("unterminated {");

5
testsuite/sed.tests
View File

@ -253,4 +253,9 @@ testing "sed c" \
"repl\nrepl\n" "" \ "repl\nrepl\n" "" \
"first\nsecond\n" "first\nsecond\n"
testing "sed nested {}s" \
"sed '/asd/ { p; /s/ { s/s/c/ }; p; q }'" \
"qwe\nasd\nacd\nacd\n" "" \
"qwe\nasd\nzxc\n"
exit $FAILCOUNT exit $FAILCOUNT