Fix lash behavior on serial consoles

diff --git a/busybox/lash.c b/busybox/lash.c
index 22e3c779eec2e95aef0a4ac2db52c09519c43e97..b3f7cb6a80e088d39fdf61b7cc708ad7913fb700 100644 (file)
--- a/busybox/lash.c
+++ b/busybox/lash.c
@@ -1524,9 +1524,15 @@ void free_memory(void)
  * we don't fight over who gets the foreground */
 static void setup_job_control()
 {
+       int status;
+       
        /* Loop until we are in the foreground.  */
-       while (tcgetpgrp (shell_terminal) != (shell_pgrp = getpgrp ()))
+       while ((status = tcgetpgrp (shell_terminal)) >= 0) {
+               if (status == (shell_pgrp = getpgrp ())) {
+                       break;
+               }
                kill (- shell_pgrp, SIGTTIN);
+       }
 
        /* Ignore interactive and job-control signals.  */
        signal(SIGINT, SIG_IGN);

diff --git a/busybox/shell/lash.c b/busybox/shell/lash.c
index 22e3c779eec2e95aef0a4ac2db52c09519c43e97..b3f7cb6a80e088d39fdf61b7cc708ad7913fb700 100644 (file)
--- a/busybox/shell/lash.c
+++ b/busybox/shell/lash.c
@@ -1524,9 +1524,15 @@ void free_memory(void)
  * we don't fight over who gets the foreground */
 static void setup_job_control()
 {
+       int status;
+       
        /* Loop until we are in the foreground.  */
-       while (tcgetpgrp (shell_terminal) != (shell_pgrp = getpgrp ()))
+       while ((status = tcgetpgrp (shell_terminal)) >= 0) {
+               if (status == (shell_pgrp = getpgrp ())) {
+                       break;
+               }
                kill (- shell_pgrp, SIGTTIN);
+       }
 
        /* Ignore interactive and job-control signals.  */
        signal(SIGINT, SIG_IGN);