Bash-4.3 patch 23

diff --git a/patchlevel.h b/patchlevel.h
index c8605ba6f8528d1b8bf0508534c31840766d2c62..36672cb3babe221e87fd41eb87cd188c854032d9 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 22
+#define PATCHLEVEL 23
 
 #endif /* _PATCHLEVEL_H_ */

diff --git a/subst.c b/subst.c
index f94d12927147cc2c6ba8e6ece1a7c242e93af4bc..b9317087a37b0d1c6192801add72400d5d528778 100644 (file)
--- a/subst.c
+++ b/subst.c
@@ -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

diff --git a/subst.h b/subst.h
index d123fccfdbb878465d77e9b8789e23e9df8d9444..cedaf8b6b444e9421760aabd96ab19e0fbd2487a 100644 (file)
--- a/subst.h
+++ b/subst.h
@@ -82,7 +82,7 @@ extern char *extract_arithmetic_subst __P((char *, int *));
 /* Extract the <( or >( construct in STRING, and return a new string.
    Start extracting at (SINDEX) as if we had just seen "<(".
    Make (SINDEX) get the position just after the matching ")". */
-extern char *extract_process_subst __P((char *, char *, int *));
+extern char *extract_process_subst __P((char *, char *, int *, int));
 #endif /* PROCESS_SUBSTITUTION */
 
 /* Extract the name of the variable to bind to from the assignment string. */