diff options
| -rw-r--r-- | shell/ash_test/ash-quoting/squote_in_varexp1.right | 3 | ||||
| -rwxr-xr-x | shell/ash_test/ash-quoting/squote_in_varexp1.tests | 4 | ||||
| -rw-r--r-- | shell/ash_test/ash-quoting/squote_in_varexp2.right | 3 | ||||
| -rwxr-xr-x | shell/ash_test/ash-quoting/squote_in_varexp2.tests | 4 | ||||
| -rw-r--r-- | shell/hush.c | 12 | ||||
| -rw-r--r-- | shell/hush_test/hush-quoting/squote_in_varexp1.right | 3 | ||||
| -rwxr-xr-x | shell/hush_test/hush-quoting/squote_in_varexp1.tests | 4 | ||||
| -rw-r--r-- | shell/hush_test/hush-quoting/squote_in_varexp2.right | 3 | ||||
| -rwxr-xr-x | shell/hush_test/hush-quoting/squote_in_varexp2.tests | 4 | ||||
| -rw-r--r-- | shell/match.c | 2 |
10 files changed, 39 insertions, 3 deletions
diff --git a/shell/ash_test/ash-quoting/squote_in_varexp1.right b/shell/ash_test/ash-quoting/squote_in_varexp1.right new file mode 100644 index 0000000..9d0add3 --- /dev/null +++ b/shell/ash_test/ash-quoting/squote_in_varexp1.right @@ -0,0 +1,3 @@ +Nothing: +Nothing: +Ok:0 diff --git a/shell/ash_test/ash-quoting/squote_in_varexp1.tests b/shell/ash_test/ash-quoting/squote_in_varexp1.tests new file mode 100755 index 0000000..efb380d --- /dev/null +++ b/shell/ash_test/ash-quoting/squote_in_varexp1.tests @@ -0,0 +1,4 @@ +x='\\\\' +printf Nothing:'%s\n' ${x#\\\\\\\\} +printf Nothing:'%s\n' "${x#\\\\\\\\}" +echo Ok:$? diff --git a/shell/ash_test/ash-quoting/squote_in_varexp2.right b/shell/ash_test/ash-quoting/squote_in_varexp2.right new file mode 100644 index 0000000..9d0add3 --- /dev/null +++ b/shell/ash_test/ash-quoting/squote_in_varexp2.right @@ -0,0 +1,3 @@ +Nothing: +Nothing: +Ok:0 diff --git a/shell/ash_test/ash-quoting/squote_in_varexp2.tests b/shell/ash_test/ash-quoting/squote_in_varexp2.tests new file mode 100755 index 0000000..806ad12 --- /dev/null +++ b/shell/ash_test/ash-quoting/squote_in_varexp2.tests @@ -0,0 +1,4 @@ +x='\\\\' +printf Nothing:'%s\n' ${x#'\\\\'} +printf Nothing:'%s\n' "${x#'\\\\'}" +echo Ok:$? diff --git a/shell/hush.c b/shell/hush.c index da4967a..762cc3f 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -4500,6 +4500,7 @@ static int add_till_closing_bracket(o_string *dest, struct in_str *input, unsign } } o_addchr(dest, ch); + //bb_error_msg("%s:o_addchr('%c')", __func__, ch); if (ch == '(' || ch == '{') { ch = (ch == '(' ? ')' : '}'); if (!add_till_closing_bracket(dest, input, ch)) @@ -4529,7 +4530,7 @@ static int add_till_closing_bracket(o_string *dest, struct in_str *input, unsign /* \x. Copy verbatim. Important for \(, \) */ ch = i_getch(input); if (ch == EOF) { - syntax_error_unterm_ch(')'); + syntax_error_unterm_ch(end_ch); return 0; } #if 0 @@ -4540,6 +4541,7 @@ static int add_till_closing_bracket(o_string *dest, struct in_str *input, unsign } #endif o_addchr(dest, ch); + //bb_error_msg("%s:o_addchr('%c') after '\\'", __func__, ch); continue; } } @@ -5843,7 +5845,13 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha if (exp_op == *exp_word) /* ## or %% */ exp_word++; debug_printf_expand("expand: exp_word:'%s'\n", exp_word); - exp_exp_word = encode_then_expand_string(exp_word, /*process_bkslash:*/ 1, /*unbackslash:*/ 1); + /* + * process_bkslash:1 unbackslash:1 breaks this: + * a='a\\'; echo ${a%\\\\} # correct output is: a + * process_bkslash:1 unbackslash:0 breaks this: + * a='a}'; echo ${a%\}} # correct output is: a + */ + exp_exp_word = encode_then_expand_string(exp_word, /*process_bkslash:*/ 0, /*unbackslash:*/ 0); if (exp_exp_word) exp_word = exp_exp_word; debug_printf_expand("expand: exp_exp_word:'%s'\n", exp_word); diff --git a/shell/hush_test/hush-quoting/squote_in_varexp1.right b/shell/hush_test/hush-quoting/squote_in_varexp1.right new file mode 100644 index 0000000..9d0add3 --- /dev/null +++ b/shell/hush_test/hush-quoting/squote_in_varexp1.right @@ -0,0 +1,3 @@ +Nothing: +Nothing: +Ok:0 diff --git a/shell/hush_test/hush-quoting/squote_in_varexp1.tests b/shell/hush_test/hush-quoting/squote_in_varexp1.tests new file mode 100755 index 0000000..efb380d --- /dev/null +++ b/shell/hush_test/hush-quoting/squote_in_varexp1.tests @@ -0,0 +1,4 @@ +x='\\\\' +printf Nothing:'%s\n' ${x#\\\\\\\\} +printf Nothing:'%s\n' "${x#\\\\\\\\}" +echo Ok:$? diff --git a/shell/hush_test/hush-quoting/squote_in_varexp2.right b/shell/hush_test/hush-quoting/squote_in_varexp2.right new file mode 100644 index 0000000..9d0add3 --- /dev/null +++ b/shell/hush_test/hush-quoting/squote_in_varexp2.right @@ -0,0 +1,3 @@ +Nothing: +Nothing: +Ok:0 diff --git a/shell/hush_test/hush-quoting/squote_in_varexp2.tests b/shell/hush_test/hush-quoting/squote_in_varexp2.tests new file mode 100755 index 0000000..806ad12 --- /dev/null +++ b/shell/hush_test/hush-quoting/squote_in_varexp2.tests @@ -0,0 +1,4 @@ +x='\\\\' +printf Nothing:'%s\n' ${x#'\\\\'} +printf Nothing:'%s\n' "${x#'\\\\'}" +echo Ok:$? diff --git a/shell/match.c b/shell/match.c index 8f2a2fb..ee8abb2 100644 --- a/shell/match.c +++ b/shell/match.c @@ -75,7 +75,7 @@ char* FAST_FUNC scan_and_match(char *string, const char *pattern, unsigned flags *loc = c; } else { r = fnmatch(pattern, loc, 0); - //bb_error_msg("fnmatch('%s','%s',0):%d", pattern, string, r); + //bb_error_msg("fnmatch('%s','%s',0):%d", pattern, loc, r); } if (r == 0) /* match found */ return loc; |