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

hush: correctly handle quoting in "case" even if !BASH_PATTERN_SUBST

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2017-07-06 01:52:23 +02:00
parent d13c1762a8
commit 637982f5bb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/hush.c
View File

@@ -5189,7 +5189,7 @@ static struct pipe *parse_stream(char **pstring,
/*** Execution routines ***/ /*** Execution routines ***/
/* Expansion can recurse, need forward decls: */ /* Expansion can recurse, need forward decls: */
#if !BASH_PATTERN_SUBST #if !BASH_PATTERN_SUBST && !ENABLE_HUSH_CASE
/* only ${var/pattern/repl} (its pattern part) needs additional mode */ /* only ${var/pattern/repl} (its pattern part) needs additional mode */
#define expand_string_to_string(str, do_unbackslash) \ #define expand_string_to_string(str, do_unbackslash) \
expand_string_to_string(str) expand_string_to_string(str)
@@ -5317,6 +5317,9 @@ static int expand_on_ifs(int *ended_with_ifs, o_string *output, int n, const cha
#endif #endif
static char *encode_then_expand_string(const char *str, int process_bkslash, int do_unbackslash) static char *encode_then_expand_string(const char *str, int process_bkslash, int do_unbackslash)
{ {
#if !BASH_PATTERN_SUBST
const int do_unbackslash = 1;
#endif
char *exp_str; char *exp_str;
struct in_str input; struct in_str input;
o_string dest = NULL_O_STRING; o_string dest = NULL_O_STRING;
@@ -5936,7 +5939,7 @@ static char **expand_strvec_to_strvec_singleword_noglob(char **argv)
*/ */
static char *expand_string_to_string(const char *str, int do_unbackslash) static char *expand_string_to_string(const char *str, int do_unbackslash)
{ {
#if !BASH_PATTERN_SUBST #if !BASH_PATTERN_SUBST && !ENABLE_HUSH_CASE
const int do_unbackslash = 1; const int do_unbackslash = 1;
#endif #endif
char *argv[2], **list; char *argv[2], **list;