commit bash-20141219 snapshot

This commit is contained in:
Chet Ramey
2015-01-12 10:56:22 -05:00
parent 3699674c66
commit 5e37553a07
31 changed files with 35134 additions and 36 deletions
+1 -5
View File
@@ -3876,13 +3876,11 @@ fix_assignment_words (words)
#endif
if (global)
w->word->flags |= W_ASSNGLOBAL;
if (integer)
w->word->flags |= W_ASSIGNINT;
}
#if defined (ARRAY_VARS)
/* Note that we saw an associative array option to a builtin that takes
assignment statements. This is a bit of a kludge. */
else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'a') || strchr (w->word->word+1, 'g')))
else if (w->word->word[0] == '-' && (strpbrk (w->word->word+1, "Aag") != 0))
#else
else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g'))
#endif
@@ -3903,8 +3901,6 @@ fix_assignment_words (words)
array = 1;
if ((wcmd->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g'))
global = 1;
if ((wcmd->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'i'))
integer = 1;
}
}