41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 2610d40b32301cd7256bf1dfc49c9f8bfe0dcd53 Mon Sep 17 00:00:00 2001
|
|
From: Chet Ramey <chet.ramey@case.edu>
|
|
Date: Wed, 28 Aug 2024 11:42:10 -0400
|
|
Subject: [PATCH] documentation updates; fix for null commands with redirection
|
|
expansion errors; changes to job notifications for interactive shells
|
|
sourcing files; fix underflow issue with word_top
|
|
|
|
Conflict:only the modified content of execute_cmd.c is rounded.
|
|
Reference:https://git.savannah.gnu.org/cgit/bash.git/commit/?id=2610d40b32301cd7256bf1dfc49c9f8bfe0dcd53
|
|
---
|
|
execute_cmd.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/execute_cmd.c b/execute_cmd.c
|
|
index 71d147c..905adc5 100644
|
|
--- a/execute_cmd.c
|
|
+++ b/execute_cmd.c
|
|
@@ -4001,7 +4001,7 @@ execute_null_command (redirects, pipe_in, pipe_out, async)
|
|
REDIRECT *redirects;
|
|
int pipe_in, pipe_out, async;
|
|
{
|
|
- int r;
|
|
+ int r, code;
|
|
int forcefork, fork_flags;
|
|
REDIRECT *rd;
|
|
|
|
@@ -4036,6 +4036,10 @@ execute_null_command (redirects, pipe_in, pipe_out, async)
|
|
if (pipe_in != NO_PIPE || pipe_out != NO_PIPE)
|
|
subshell_environment |= SUBSHELL_PIPE;
|
|
|
|
+ code = setjmp_nosigs (top_level);
|
|
+ if (code)
|
|
+ exit (EXECUTION_FAILURE);
|
|
+
|
|
if (do_redirections (redirects, RX_ACTIVE) == 0)
|
|
exit (EXECUTION_SUCCESS);
|
|
else
|
|
--
|
|
2.33.0
|
|
|