dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.2 patch 32

Browse source
This commit is contained in:
Chet Ramey 2012-07-10 09:44:07 -04:00
commit a601c74902
2 changed files with 11 additions and 3 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 31 #define PATCHLEVEL 32
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */

12
subst.c
View file

@ -8151,6 +8151,14 @@ add_string:
temp = tword->word; temp = tword->word;
dispose_word_desc (tword); dispose_word_desc (tword);
/* Kill quoted nulls; we will add them back at the end of
expand_word_internal if nothing else in the string */
if (had_quoted_null && temp && QUOTED_NULL (temp))
{
FREE (temp);
temp = (char *)NULL;
}
goto add_string; goto add_string;
break; break;
@ -8555,7 +8563,7 @@ finished_with_string:
tword->flags |= W_NOEXPAND; /* XXX */ tword->flags |= W_NOEXPAND; /* XXX */
if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
tword->flags |= W_QUOTED; tword->flags |= W_QUOTED;
if (had_quoted_null) if (had_quoted_null && QUOTED_NULL (istring))
tword->flags |= W_HASQUOTEDNULL; tword->flags |= W_HASQUOTEDNULL;
list = make_word_list (tword, (WORD_LIST *)NULL); list = make_word_list (tword, (WORD_LIST *)NULL);
} }
@ -8586,7 +8594,7 @@ finished_with_string:
tword->flags |= W_NOGLOB; tword->flags |= W_NOGLOB;
if (word->flags & W_NOEXPAND) if (word->flags & W_NOEXPAND)
tword->flags |= W_NOEXPAND; tword->flags |= W_NOEXPAND;
if (had_quoted_null) if (had_quoted_null && QUOTED_NULL (istring))
tword->flags |= W_HASQUOTEDNULL; /* XXX */ tword->flags |= W_HASQUOTEDNULL; /* XXX */
list = make_word_list (tword, (WORD_LIST *)NULL); list = make_word_list (tword, (WORD_LIST *)NULL);
} }