pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-07-14 15:40:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix export environment if a local variable inherits the export attribute from a variable with the same name at a previous scope; changes to help builtin and glob pattern arguments; fix for fpurge declaration in a source file; man page typesetting updates

Browse Source
This commit is contained in:
Chet Ramey
2025-11-19 10:18:54 -05:00
parent 2fd02c8387
commit bcac47f08a
10 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builtins/help.def
+14 -16
View File
@@ -91,9 +91,9 @@ static void show_longdoc (int);
int
help_builtin (WORD_LIST *list)
{
register int i;
int i;
char *pattern, *name;
int match_found, sflag, dflag, mflag, m, pass, this_found;
int match_found, sflag, dflag, mflag, m, pass, this_found, globpat;
size_t plen;
dflag = sflag = mflag = 0;
@@ -128,18 +128,15 @@ help_builtin (WORD_LIST *list)
/* We should consider making `help bash' do something. */
if (glob_pattern_p (list->word->word) == 1)
{
printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
print_word_list (list, ", ");
printf ("%s", _("'\n\n"));
}
for (match_found = 0, pattern = ""; list; list = list->next)
{
pattern = list->word->word;
plen = strlen (pattern);
globpat = glob_pattern_p (pattern);
if (globpat)
printf (_("Shell commands matching pattern '%s':\n\n"), pattern);
for (pass = 1, this_found = 0; pass < 3; pass++)
{
for (i = 0; name = shell_builtins[i].name; i++)
@@ -178,15 +175,16 @@ help_builtin (WORD_LIST *list)
if (pass == 1 && this_found == 1)
break;
}
if (this_found == 0)
{
if (globpat)
builtin_error (_("no help topics match '%s'."), pattern);
else
builtin_error (_("no help topics match '%s'. Try 'help help', 'man -k %s', or 'info %s'."), pattern, pattern, pattern);
}
}
if (match_found == 0)
{
builtin_error (_("no help topics match `%s'. Try `help help' or `man -k %s' or `info %s'."), pattern, pattern, pattern);
return (EXECUTION_FAILURE);
}
return (sh_chkwrite (EXECUTION_SUCCESS));
return (match_found ? sh_chkwrite (EXECUTION_SUCCESS) : sh_chkwrite (EXECUTION_FAILURE));
}
void