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

diff --git a/hush.c b/hush.c
index 976fa3805d1c3c80be15a1b7846b10800ae0f6aa..b8e4a55c26bf8914114306ccce6ffd2a1b51f112 100644 (file)
--- a/hush.c
+++ b/hush.c
@@ -1185,7 +1185,7 @@ static int run_pipe_real(struct pipe *pi)
        pi->pgrp = 0;
 
        /* Check if we are supposed to run in the foreground */
-       if (pi->followup!=PIPE_BG) {
+       if (interactive && pi->followup!=PIPE_BG) {
                if ((pi->pgrp = tcgetpgrp(ctty = 2)) < 0
                                && (pi->pgrp = tcgetpgrp(ctty = 0)) < 0
                                && (pi->pgrp = tcgetpgrp(ctty = 1)) < 0)

diff --git a/shell/hush.c b/shell/hush.c
index 976fa3805d1c3c80be15a1b7846b10800ae0f6aa..b8e4a55c26bf8914114306ccce6ffd2a1b51f112 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1185,7 +1185,7 @@ static int run_pipe_real(struct pipe *pi)
        pi->pgrp = 0;
 
        /* Check if we are supposed to run in the foreground */
-       if (pi->followup!=PIPE_BG) {
+       if (interactive && pi->followup!=PIPE_BG) {
                if ((pi->pgrp = tcgetpgrp(ctty = 2)) < 0
                                && (pi->pgrp = tcgetpgrp(ctty = 0)) < 0
                                && (pi->pgrp = tcgetpgrp(ctty = 1)) < 0)