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

fixed a bug with expanding unquoted $* when the separator is not whitespace and one or more of the positional parameters ends with the separator, resulting in an extra blank field being generated; fixed an issue with adjusting SHLVL in subshells that caused the environment to be rebuilt too many times; fix to make sure function substitution doesn't leave the -v option unset

Browse Source
This commit is contained in:
Chet Ramey
2026-05-20 10:18:32 -04:00
parent 669b32f676
commit 2d4ba0c618
15 changed files with 503 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
execute_cmd.c
+22 -6
View File
@@ -5937,17 +5937,26 @@ execute_disk_command (WORD_LIST *words, REDIRECT *redirects, char *command_line,
if (command)
{
/* If we're optimizing out the fork (implicit `exec'), decrement the
shell level like `exec' would do. Don't do this if we are already
in a pipeline environment, assuming it's already been done. */
if (nofork && pipe_in == NO_PIPE && pipe_out == NO_PIPE && (subshell_environment & SUBSHELL_PIPE) == 0)
adjust_shell_level (-1);
#if defined (STRICT_POSIX)
if (posixly_correct == 0 || subst_assign_varlist == 0) /* Done below. */
#endif
{
maybe_make_export_env ();
/* If we're optimizing out the fork (implicit `exec'), decrement the
shell level like `exec' would do. Don't do this if we are already
in a pipeline environment, assuming it's already been done.
Since we've just (possibly) remade the export environment, it's
marked as not dirty, so we update SHLVL in place rather than
remake the whole thing again or force a remake we would not
otherwise have to do. This mostly hits command substitutions with
a lot of exported variables, since command_substitute already
calls maybe_make_export_env (). */
if (nofork && pipe_in == NO_PIPE && pipe_out == NO_PIPE && (subshell_environment & SUBSHELL_PIPE) == 0)
{
adjust_shell_level (-1);
update_export_env_inplace ("SHLVL=", 6, get_string_value ("SHLVL"));
array_needs_making = 0;
}
put_command_name_into_env (command);
}
}
@@ -6035,6 +6044,13 @@ execute_disk_command (WORD_LIST *words, REDIRECT *redirects, char *command_line,
expand_assignment_statements (command, 0);
maybe_make_export_env ();
/* See above for why we do this here. */
if (nofork && pipe_in == NO_PIPE && pipe_out == NO_PIPE && (subshell_environment & SUBSHELL_PIPE) == 0)
{
adjust_shell_level (-1);
update_export_env_inplace ("SHLVL=", 6, get_string_value ("SHLVL"));
array_needs_making = 0;
}
put_command_name_into_env (command);
}
#endif