bash/backport-renamed-several-functions-beginning-with-legal_-chan.patch

33 lines
995 B
Diff
Raw Normal View History

2024-04-26 17:15:34 +08:00
From b30389070ab27e0429a7c16bae492afd1a8b0f6c Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 6 Nov 2023 09:26:02 -0500
Subject: [PATCH] renamed several functions beginning with legal_; changed all
callers
Conflict:partial round, only the modified content of brace_expand_word_list is rounded.
Reference:https://git.savannah.gnu.org/cgit/bash.git/commit/?id=b30389070ab27e0429a7c16bae492afd1a8b0f6c
---
subst.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/subst.c b/subst.c
index 779bed3..a5429f4 100644
--- a/subst.c
+++ b/subst.c
@@ -11526,6 +11526,12 @@ brace_expand_word_list (tlist, eflags)
if (mbschr (tlist->word->word, LBRACE))
{
expansions = brace_expand (tlist->word->word);
+ if (expansions == 0)
+ {
+ expansions = strvec_create (2);
+ expansions[0] = savestring (tlist->word->word);
+ expansions[1] = NULL;
+ }
for (eindex = 0; temp_string = expansions[eindex]; eindex++)
{
--
2.33.0