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

hush: fix quoted_punct.tests failure

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-05 23:12:15 +02:00
parent 4142f0187d
commit bd43c6784f
4 changed files with 83 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/ash.c
View File

@ -7613,7 +7613,9 @@ expandhere(union node *arg, int fd)
static int static int
patmatch(char *pattern, const char *string) patmatch(char *pattern, const char *string)
{ {
return pmatch(preglob(pattern, 0), string); char *p = preglob(pattern, 0);
//bb_error_msg("fnmatch(pattern:'%s',str:'%s')", p, string);
return pmatch(p, string);
} }
/* /*

6
shell/hush.c
View File

@ -5969,7 +5969,7 @@ static char *expand_string_to_string(const char *str, int do_unbackslash)
return (char*)list; return (char*)list;
} }
/* Used for "eval" builtin */ /* Used for "eval" builtin and case string */
static char* expand_strvec_to_string(char **argv) static char* expand_strvec_to_string(char **argv)
{ {
char **list; char **list;
@ -8053,6 +8053,7 @@ static int run_list(struct pipe *pi)
if (rword == RES_CASE) { if (rword == RES_CASE) {
debug_printf_exec("CASE cond_code:%d\n", cond_code); debug_printf_exec("CASE cond_code:%d\n", cond_code);
case_word = expand_strvec_to_string(pi->cmds->argv); case_word = expand_strvec_to_string(pi->cmds->argv);
unbackslash(case_word);
continue; continue;
} }
if (rword == RES_MATCH) { if (rword == RES_MATCH) {
@ -8064,9 +8065,10 @@ static int run_list(struct pipe *pi)
/* all prev words didn't match, does this one match? */ /* all prev words didn't match, does this one match? */
argv = pi->cmds->argv; argv = pi->cmds->argv;
while (*argv) { while (*argv) {
char *pattern = expand_string_to_string(*argv, /*unbackslash:*/ 1); char *pattern = expand_string_to_string(*argv, /*unbackslash:*/ 0);
/* TODO: which FNM_xxx flags to use? */ /* TODO: which FNM_xxx flags to use? */
cond_code = (fnmatch(pattern, case_word, /*flags:*/ 0) != 0); cond_code = (fnmatch(pattern, case_word, /*flags:*/ 0) != 0);
debug_printf_exec("fnmatch(pattern:'%s',str:'%s'):%d\n", pattern, case_word, cond_code);
free(pattern); free(pattern);
if (cond_code == 0) { /* match! we will execute this branch */ if (cond_code == 0) { /* match! we will execute this branch */
free(case_word); free(case_word);

35
shell/hush_test/hush-quoting/quoted_punct.right Normal file
View File

@ -0,0 +1,35 @@
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok

41
shell/hush_test/hush-quoting/quoted_punct.tests Executable file
View File

@ -0,0 +1,41 @@
# Testing glob-escaping of every ASCII punctuation char
# Some chars have more than one test
# 21..2f
case '!' in [\!] ) echo ok;; *) echo 'WRONG!';; esac
case '"' in [\"] ) echo ok;; *) echo 'WRONG"';; esac
case '#' in [\#] ) echo ok;; *) echo 'WRONG#';; esac
case '$' in [\$] ) echo ok;; *) echo 'WRONG$';; esac
case '%' in [\%] ) echo ok;; *) echo 'WRONG%';; esac
case '&' in [\&] ) echo ok;; *) echo 'WRONG&';; esac
case "'" in [\'] ) echo ok;; *) echo "WRONG'";; esac
case '(' in [\(] ) echo ok;; *) echo 'WRONG(';; esac
case ')' in [\)] ) echo ok;; *) echo 'WRONG)';; esac
case '*' in [\*] ) echo ok;; *) echo 'WRONG*';; esac
case '+' in [\+] ) echo ok;; *) echo 'WRONG+';; esac
case ',' in [\,] ) echo ok;; *) echo 'WRONG,';; esac
case '-' in [\-] ) echo ok;; *) echo 'WRONG-';; esac
case '-' in [a\-c]) echo ok;; *) echo 'WRONGa\-c';; esac
case '.' in [\.] ) echo ok;; *) echo 'WRONG.';; esac
case '/' in [\/] ) echo ok;; *) echo 'WRONG/';; esac
# 3a..40
case ':' in [\:] ) echo ok;; *) echo 'WRONG:';; esac
case ';' in [\;] ) echo ok;; *) echo 'WRONG;';; esac
case '<' in [\<] ) echo ok;; *) echo 'WRONG<';; esac
case '=' in [\=] ) echo ok;; *) echo 'WRONG=';; esac
case '>' in [\>] ) echo ok;; *) echo 'WRONG>';; esac
case '?' in [\?] ) echo ok;; *) echo 'WRONG?';; esac
case '@' in [\@] ) echo ok;; *) echo 'WRONG@';; esac
# 5b..60
case '[' in [\[] ) echo ok;; *) echo 'WRONG[';; esac
case '\' in [\\] ) echo ok;; *) echo 'WRONG\';; esac
case '\' in \\ ) echo ok;; *) echo 'WRONG\\';; esac
case ']' in [\]] ) echo ok;; *) echo 'WRONG]';; esac
case ']' in [a\]]) echo ok;; *) echo 'WRONGa]';; esac
case '^' in [\^] ) echo ok;; *) echo 'WRONG^';; esac
case '_' in [\_] ) echo ok;; *) echo 'WRONG_';; esac
case '`' in [\`] ) echo ok;; *) echo 'WRONG`';; esac
# 7b..7e
case '{' in [\{] ) echo ok;; *) echo 'WRONG{';; esac
case '|' in [\|] ) echo ok;; *) echo 'WRONG|';; esac
case '}' in [\}] ) echo ok;; *) echo 'WRONG}';; esac
case '~' in [\~] ) echo ok;; *) echo 'WRONG~';; esac