diff options
author | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 19:59:44 -0500 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 19:59:44 -0500 |
commit | 49ed961bb057ad481b8f22066d55526ecdfb3c09 (patch) | |
tree | 0de5c07d3d11d5f6af176fd8069f63b11b428d33 /subst.c | |
parent | 4692bbe41839a7f5ed03e7bc73ab9fc1be9a7ea0 (diff) | |
download | android_external_bash-49ed961bb057ad481b8f22066d55526ecdfb3c09.tar.gz android_external_bash-49ed961bb057ad481b8f22066d55526ecdfb3c09.tar.bz2 android_external_bash-49ed961bb057ad481b8f22066d55526ecdfb3c09.zip |
Bash-4.2 patch 1
Diffstat (limited to 'subst.c')
-rw-r--r-- | subst.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1379,10 +1379,12 @@ extract_dollar_brace_string (string, sindex, quoted, flags) slen = strlen (string + *sindex) + *sindex; /* The handling of dolbrace_state needs to agree with the code in parse.y: - parse_matched_pair() */ - dolbrace_state = 0; - if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) - dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; + parse_matched_pair(). The different initial value is to handle the + case where this function is called to parse the word in + ${param op word} (SX_WORD). */ + dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; + if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) + dolbrace_state = DOLBRACE_QUOTE; i = *sindex; while (c = string[i]) @@ -7176,7 +7178,7 @@ parameter_brace_expand (string, indexp, quoted, pflags, quoted_dollar_atp, conta { /* Extract the contents of the ${ ... } expansion according to the Posix.2 rules. */ - value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); + value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); if (string[sindex] == RBRACE) sindex++; else |