LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-4.3 patch 23

Browse Source
This commit is contained in:
Chet Ramey
2014-08-18 11:45:12 -04:00
parent df2c55de9c
commit 85b94814db
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 22 #define PATCHLEVEL 23
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */

12
subst.c
View File

@@ -1192,12 +1192,18 @@ extract_arithmetic_subst (string, sindex)
Start extracting at (SINDEX) as if we had just seen "<(". Start extracting at (SINDEX) as if we had just seen "<(".
Make (SINDEX) get the position of the matching ")". */ /*))*/ Make (SINDEX) get the position of the matching ")". */ /*))*/
char * char *
extract_process_subst (string, starter, sindex) extract_process_subst (string, starter, sindex, xflags)
char *string; char *string;
char *starter; char *starter;
int *sindex; int *sindex;
int xflags;
{ {
#if 0
return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND)); 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 */ #endif /* PROCESS_SUBSTITUTION */
@@ -1785,7 +1791,7 @@ skip_to_delim (string, start, delims, flags)
si = i + 2; si = i + 2;
if (string[si] == '\0') if (string[si] == '\0')
CQ_RETURN(si); CQ_RETURN(si);
temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si); temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si, 0);
free (temp); /* no SX_ALLOC here */ free (temp); /* no SX_ALLOC here */
i = si; i = si;
if (string[i] == '\0') if (string[i] == '\0')
@@ -8249,7 +8255,7 @@ add_string:
else else
t_index = sindex + 1; /* skip past both '<' and LPAREN */ 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; sindex = t_index;
/* If the process substitution specification is `<()', we want to /* If the process substitution specification is `<()', we want to

2
subst.h
View File

@@ -82,7 +82,7 @@ extern char *extract_arithmetic_subst __P((char *, int *));
/* Extract the <( or >( construct in STRING, and return a new string. /* Extract the <( or >( construct in STRING, and return a new string.
Start extracting at (SINDEX) as if we had just seen "<(". Start extracting at (SINDEX) as if we had just seen "<(".
Make (SINDEX) get the position just after the matching ")". */ 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 */ #endif /* PROCESS_SUBSTITUTION */
/* Extract the name of the variable to bind to from the assignment string. */ /* Extract the name of the variable to bind to from the assignment string. */