You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.6 KiB
47 lines
1.6 KiB
From 0eb5e47f531b49c8d048c9ae9657eeb63f49a9f3 Mon Sep 17 00:00:00 2001 |
|
From: Siteshwar Vashisht <svashisht@redhat.com> |
|
Date: Fri, 13 May 2016 01:34:06 +0530 |
|
Subject: [PATCH] Fix shopt lastpipe mode crash |
|
|
|
--- |
|
execute_cmd.c | 23 ++++++++++++++++++++--- |
|
1 file changed, 20 insertions(+), 3 deletions(-) |
|
|
|
diff --git a/execute_cmd.c b/execute_cmd.c |
|
index c5cf6d2..7b22460 100644 |
|
--- a/execute_cmd.c |
|
+++ b/execute_cmd.c |
|
@@ -2254,11 +2254,28 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close) |
|
if (lastpipe_flag) |
|
{ |
|
#if defined (JOB_CONTROL) |
|
- append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid); |
|
-#endif |
|
+ if (INVALID_JOB (lastpipe_jid) == 0) |
|
+ { |
|
+ append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid); |
|
+ lstdin = wait_for (lastpid); |
|
+ } |
|
+ else |
|
+ lstdin = wait_for_single_pid (lastpid); /* checks bgpids list */ |
|
+#else |
|
lstdin = wait_for (lastpid); |
|
+#endif |
|
+ |
|
#if defined (JOB_CONTROL) |
|
- exec_result = job_exit_status (lastpipe_jid); |
|
+ /* If wait_for removes the job from the jobs table, use result of last |
|
+ command as pipeline's exit status as usual. The jobs list can get |
|
+ frozen and unfrozen at inconvenient times if there are multiple pipelines |
|
+ running simultaneously. */ |
|
+ if (INVALID_JOB (lastpipe_jid) == 0) |
|
+ exec_result = job_exit_status (lastpipe_jid); |
|
+ else if (pipefail_opt) |
|
+ exec_result = exec_result | lstdin; /* XXX */ |
|
+ /* otherwise we use exec_result */ |
|
+ |
|
#endif |
|
unfreeze_jobs_list (); |
|
} |
|
-- |
|
2.5.5
|
|
|