From 0b913689b8d913c98b193607870713832935e07d Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Tue, 10 Jul 2012 09:44:54 -0400 Subject: [PATCH] Bash-4.2 patch 36 --- patchlevel.h | 2 +- subst.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/patchlevel.h b/patchlevel.h index 1af8e56..9868481 100644 --- 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 35 +#define PATCHLEVEL 36 #endif /* _PATCHLEVEL_H_ */ diff --git a/subst.c b/subst.c index 1915120..937c71d 100644 --- a/subst.c +++ b/subst.c @@ -7922,7 +7922,7 @@ expand_word_internal (word, quoted, isexp, contains_dollar_at, expanded_somethin /* State flags */ int had_quoted_null; - int has_dollar_at; + int has_dollar_at, temp_has_dollar_at; int tflag; int pflags; /* flags passed to param_expand */ @@ -8127,13 +8127,14 @@ add_string: if (expanded_something) *expanded_something = 1; - has_dollar_at = 0; + temp_has_dollar_at = 0; pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; if (word->flags & W_NOSPLIT2) pflags |= PF_NOSPLIT2; tword = param_expand (string, &sindex, quoted, expanded_something, - &has_dollar_at, "ed_dollar_at, + &temp_has_dollar_at, "ed_dollar_at, &had_quoted_null, pflags); + has_dollar_at += temp_has_dollar_at; if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) { @@ -8274,9 +8275,10 @@ add_twochars: temp = (char *)NULL; - has_dollar_at = 0; + temp_has_dollar_at = 0; /* XXX */ /* Need to get W_HASQUOTEDNULL flag through this function. */ - list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL); + list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL); + has_dollar_at += temp_has_dollar_at; if (list == &expand_word_error || list == &expand_word_fatal) { -- 2.7.4