← Commit list

abf755615

Denys Vlasenko
Denys Vlasenko
2018-04-02
SUCCESS Duration: 140s

Subject

hush: fix a backslash-removal bug in case

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

shell/ash_test/ash-quoting/bkslash_case2.right +3 -0shell/ash_test/ash-quoting/bkslash_case2.tests +13 -0shell/hush.c +5 -3shell/hush_test/hush-quoting/bkslash_case2.right +3 -0shell/hush_test/hush-quoting/bkslash_case2.tests +13 -0
shell/ash_test/ash-quoting/bkslash_case2.right+3 -0
@@ -0,0 +1,3 @@
+ok1
+ok2
+Ok:0
shell/ash_test/ash-quoting/bkslash_case2.tests+13 -0
@@ -0,0 +1,13 @@
+x='\abc'
+
+case "$x" in
+\\*) echo ok1;;
+*) echo BUG1;;
+esac
+
+case $x in
+\\*) echo ok2;;
+*) echo BUG2;;
+esac
+
+echo Ok:$?
shell/hush.c+5 -3
@@ -6347,7 +6347,7 @@ static char *expand_string_to_string(const char *str, int do_unbackslash)
return (char*)list;
}
-#if ENABLE_HUSH_CASE
+#if 0
static char* expand_strvec_to_string(char **argv)
{
char **list;
@@ -8731,8 +8731,10 @@ static int run_list(struct pipe *pi)
#if ENABLE_HUSH_CASE
if (rword == RES_CASE) {
debug_printf_exec("CASE cond_code:%d\n", cond_code);
- case_word = expand_strvec_to_string(pi->cmds->argv);
- unbackslash(case_word);
+ case_word = expand_string_to_string(pi->cmds->argv[0], 1);
+ debug_printf_exec("CASE word1:'%s'\n", case_word);
+ //unbackslash(case_word);
+ //debug_printf_exec("CASE word2:'%s'\n", case_word);
continue;
}
if (rword == RES_MATCH) {
shell/hush_test/hush-quoting/bkslash_case2.right+3 -0
@@ -0,0 +1,3 @@
+ok1
+ok2
+Ok:0
shell/hush_test/hush-quoting/bkslash_case2.tests+13 -0
@@ -0,0 +1,13 @@
+x='\abc'
+
+case "$x" in
+\\*) echo ok1;;
+*) echo BUG1;;
+esac
+
+case $x in
+\\*) echo ok2;;
+*) echo BUG2;;
+esac
+
+echo Ok:$?