diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-08-18 11:45:12 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-08-18 11:45:12 -0400 |
| commit | 85b94814db40fa40856fb80c18f0dcbf62a75a75 (patch) | |
| tree | 7722804cad8658914956b6bf033f98f4a41c0d30 /subst.c | |
| parent | df2c55de9c87c2ee8904280d26e80f5c48dd6434 (diff) | |
| download | android_external_bash-85b94814db40fa40856fb80c18f0dcbf62a75a75.tar.gz android_external_bash-85b94814db40fa40856fb80c18f0dcbf62a75a75.tar.bz2 android_external_bash-85b94814db40fa40856fb80c18f0dcbf62a75a75.zip | |
Bash-4.3 patch 23
Diffstat (limited to 'subst.c')
| -rw-r--r-- | subst.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1192,12 +1192,18 @@ extract_arithmetic_subst (string, sindex) Start extracting at (SINDEX) as if we had just seen "<(". Make (SINDEX) get the position of the matching ")". */ /*))*/ char * -extract_process_subst (string, starter, sindex) +extract_process_subst (string, starter, sindex, xflags) char *string; char *starter; int *sindex; + int xflags; { +#if 0 return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND)); +#else + xflags |= (no_longjmp_on_fatal_error ? SX_NOLONGJMP : 0); + return (xparse_dolparen (string, string+*sindex, sindex, xflags)); +#endif } #endif /* PROCESS_SUBSTITUTION */ @@ -1785,7 +1791,7 @@ skip_to_delim (string, start, delims, flags) si = i + 2; if (string[si] == '\0') CQ_RETURN(si); - temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si); + temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si, 0); free (temp); /* no SX_ALLOC here */ i = si; if (string[i] == '\0') @@ -8249,7 +8255,7 @@ add_string: else t_index = sindex + 1; /* skip past both '<' and LPAREN */ - temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index); /*))*/ + temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index, 0); /*))*/ sindex = t_index; /* If the process substitution specification is `<()', we want to |