aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-05-04 22:13:37 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-05-04 22:13:37 +0000
commit884df58b5a59dcce9dc98d9bdf988493ae440bf1 (patch)
tree80b421711d8dac01773031ac2f147a0e6a2afc96 /shell
parentb371eec2dfdb5882be87ecb3031a0d056a4c7cee (diff)
downloadbusybox-w32-884df58b5a59dcce9dc98d9bdf988493ae440bf1.tar.gz
busybox-w32-884df58b5a59dcce9dc98d9bdf988493ae440bf1.tar.bz2
busybox-w32-884df58b5a59dcce9dc98d9bdf988493ae440bf1.zip
Larry's variant on Evin Robertson's fix to what I messed up
trying to make job control work. This fix makes it so that hush doesn't error out when init hasn't set up job control, as in when init=/bin/sh git-svn-id: svn://busybox.net/trunk/busybox@2537 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell')
-rw-r--r--shell/hush.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 976fa3805..b8e4a55c2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1185,7 +1185,7 @@ static int run_pipe_real(struct pipe *pi)
1185 pi->pgrp = 0; 1185 pi->pgrp = 0;
1186 1186
1187 /* Check if we are supposed to run in the foreground */ 1187 /* Check if we are supposed to run in the foreground */
1188 if (pi->followup!=PIPE_BG) { 1188 if (interactive && pi->followup!=PIPE_BG) {
1189 if ((pi->pgrp = tcgetpgrp(ctty = 2)) < 0 1189 if ((pi->pgrp = tcgetpgrp(ctty = 2)) < 0
1190 && (pi->pgrp = tcgetpgrp(ctty = 0)) < 0 1190 && (pi->pgrp = tcgetpgrp(ctty = 0)) < 0
1191 && (pi->pgrp = tcgetpgrp(ctty = 1)) < 0) 1191 && (pi->pgrp = tcgetpgrp(ctty = 1)) < 0)