aboutsummaryrefslogtreecommitdiffstats
path: root/jobs.c
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>1998-07-23 14:37:54 +0000
committerJari Aalto <jari.aalto@cante.net>2009-09-12 16:46:52 +0000
commitbc4cd23ce958feda898c618215f94d8a4e8f4ffa (patch)
tree32fc9a13b636cb4d29873feddc533d3dfb25a917 /jobs.c
parentcce855bc5b117cb7ae70064131120687bc69fac0 (diff)
downloadandroid_external_bash-bc4cd23ce958feda898c618215f94d8a4e8f4ffa.tar.gz
android_external_bash-bc4cd23ce958feda898c618215f94d8a4e8f4ffa.tar.bz2
android_external_bash-bc4cd23ce958feda898c618215f94d8a4e8f4ffa.zip
Imported from ../bash-2.02.1.tar.gz.
Diffstat (limited to 'jobs.c')
-rw-r--r--jobs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/jobs.c b/jobs.c
index 59fcc03..e1340c4 100644
--- a/jobs.c
+++ b/jobs.c
@@ -925,9 +925,9 @@ print_pipeline (p, job_index, format, stream)
else
{
if (WIFSTOPPED (show->status))
- temp = strsignal (WSTOPSIG (show->status));
+ temp = (char *)strsignal (WSTOPSIG (show->status));
else if (WIFSIGNALED (show->status))
- temp = strsignal (WTERMSIG (show->status));
+ temp = (char *)strsignal (WTERMSIG (show->status));
else if (WIFEXITED (show->status))
{
temp = retcode_name_buffer;
@@ -1191,7 +1191,7 @@ make_child (command, async_p)
if (pipeline_pgrp == mine)
{
#endif
- if (async_p == 0)
+ if (async_p == 0 && pipeline_pgrp != shell_pgrp)
give_terminal_to (pipeline_pgrp);
#if defined (PGRP_PIPE)