diff options
| -rw-r--r-- | include/wordsplit.h | 11 | ||||
| -rw-r--r-- | src/wordsplit.c | 6 | ||||
| -rw-r--r-- | tests/wordsplit.at | 18 | ||||
| -rw-r--r-- | tests/wsp.c | 5 |
4 files changed, 35 insertions, 5 deletions
diff --git a/include/wordsplit.h b/include/wordsplit.h index 3a7ab25..a175275 100644 --- a/include/wordsplit.h +++ b/include/wordsplit.h @@ -201,9 +201,7 @@ struct wordsplit #define WRDSO_FAILGLOB 0x00000002 /* Allow a leading period to be matched by metacharacters. */ #define WRDSO_DOTGLOB 0x00000004 -#if 0 /* Unused value */ -#define WRDSO_ARGV 0x00000008 -#endif +/* Unused value: 0x00000008 */ /* Keep backslash in unrecognized escape sequences in words */ #define WRDSO_BSKEEP_WORD 0x00000010 /* Handle octal escapes in words */ @@ -220,6 +218,13 @@ struct wordsplit #define WRDSO_OESC_QUOTE 0x00000200 /* Handle hex escapes in quoted strings */ #define WRDSO_XESC_QUOTE 0x00000400 +/* Unused: 0x00000800 */ +/* Don't split variable references, even if they contain whitespace + (e.g. ${VAR:-foo bar}) */ +#define WRDSO_NOVARSPLIT 0x00001000 +/* Don't split commands, even containing whitespace, e.g. + $(echo foo bar) */ +#define WRDSO_NOCMDSPLIT 0x00002000 #define WRDSO_BSKEEP WRDSO_BSKEEP_WORD #define WRDSO_OESC WRDSO_OESC_WORD diff --git a/src/wordsplit.c b/src/wordsplit.c index e979f27..521a1eb 100644 --- a/src/wordsplit.c +++ b/src/wordsplit.c @@ -2058,11 +2058,13 @@ scan_word (struct wordsplit *wsp, size_t start, int consume_all) if (command[i] == '$') { - if (!(wsp->ws_flags & WRDSF_NOVAR) + if ((!(wsp->ws_flags & WRDSF_NOVAR) + || (wsp->ws_options & WRDSO_NOVARSPLIT)) && command[i+1] == '{' && find_closing_paren (command, i + 2, len, &i, "{}") == 0) continue; - if (!(wsp->ws_flags & WRDSF_NOCMD) + if ((!(wsp->ws_flags & WRDSF_NOCMD) + || (wsp->ws_options & WRDSO_NOCMDSPLIT)) && command[i+1] == '(' && find_closing_paren (command, i + 2, len, &i, "()") == 0) continue; diff --git a/tests/wordsplit.at b/tests/wordsplit.at index e3af703..1f2e80d 100644 --- a/tests/wordsplit.at +++ b/tests/wordsplit.at @@ -950,6 +950,24 @@ TOTAL: 3 [input exhausted ])) +TESTWSP([variable nosplit],[],[novar novarsplit], +[begin ${VAR:- a b} end], +[NF: 3 +0: begin +1: "${VAR:- a b}" +2: end +TOTAL: 3 +]) + +TESTWSP([command nosplit],[],[nocmd nocmdsplit], +[begin $(words a b) end], +[NF: 3 +0: begin +1: "$(words a b)" +2: end +TOTAL: 3 +]) + m4_popdef([TESTWSP]) m4_popdef([wspnum]) m4_popdef([wspid]) diff --git a/tests/wsp.c b/tests/wsp.c index cca3a36..bd13e63 100644 --- a/tests/wsp.c +++ b/tests/wsp.c @@ -64,6 +64,11 @@ struct kwd opt_keytab[] = { { "nullglob", WRDSO_NULLGLOB }, { "failglob", WRDSO_FAILGLOB }, { "dotglob", WRDSO_DOTGLOB }, + { "bskeep_words", WRDSO_BSKEEP_WORD }, + { "bskeep_quote", WRDSO_BSKEEP_QUOTE }, + { "bskeep", WRDSO_BSKEEP_WORD|WRDSO_BSKEEP_QUOTE }, + { "novarsplit", WRDSO_NOVARSPLIT }, + { "nocmdsplit", WRDSO_NOCMDSPLIT }, { NULL, 0 } }; |