enter: Save and restore the terminal settings.

[micoforia.git] / micoforia.c

diff --git a/micoforia.c b/micoforia.c
index d5f300e9ec3e8326dcb85ad613e1ca9b40c25e7e..b09f352b8c5c9b800809c79b4452627478fe5bb4 100644 (file)
--- a/micoforia.c
+++ b/micoforia.c
@@ -890,6 +890,7 @@ static void create_standard_device_nodes(struct container_runtime *cr)
                {.major = 1, .minor = 8, .mode = 0666, .name = "random"},
                {.major = 1, .minor = 9, .mode = 0666, .name = "urandom"},
                {.major = 4, .minor = 0, .mode = 0620, .name = "tty0"},
+               {.major = 5, .minor = 0, .mode = 0666, .name = "tty"},
                {.major = 5, .minor = 1, .mode = 0600, .name = "console"},
                {.major = 5, .minor = 2, .mode = 0666, .name = "ptmx"},
        };
@@ -1928,6 +1929,8 @@ static bool com_enter(void)
        bool success;
        int ret, pid;
        char *errctx;
+       struct termios tios;
+       bool tty;
 
        ret = lls_check_arg_count(sublpr, 1, INT_MAX, &errctx);
        if (ret < 0)
@@ -1950,7 +1953,21 @@ static bool com_enter(void)
                        : dflt_cmd[n];
        argv[N - 1] = NULL;
        clean_env();
+       tty = false;
+       if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
+               if (tcgetattr(STDIN_FILENO, &tios) >= 0)
+                       tty = true;
+       }
        success = xexec(argv, NULL);
+       if (tty) { /* reset terminal settings */
+               /*
+                * First give up the controlling terminal. Without this, the
+                * command gets SIGSTOP and goes to the background. We ignore
+                * errors here because nobody cares about a messed up terminal.
+                */
+               ioctl(STDIN_FILENO, TIOCNOTTY);
+               tcsetattr(STDIN_FILENO, TCSAFLUSH, &tios);
+       }
        free(argv);
        return success;
 }