- don't free user-supplied string (via -e)

[oweals/busybox.git] / console-tools / openvt.c

diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index 6f2aa19c40501d8e3a25f1290e3638dd454c4636..0906de46fb899575df3451cb53c5aaea58d0a356 100644 (file)
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -60,8 +60,9 @@ static int get_vt_fd(void)
        /* Do we, by chance, already have it? */
        for (fd = 0; fd < 3; fd++)
                if (!not_vt_fd(fd))
-                       return fd;
-       /* _only_ O_NONBLOCK: ask for neither read not write perms */
+                       return fd;
+       /* _only_ O_NONBLOCK: ask for neither read nor write perms */
+       /*FIXME: use? device_open(DEV_CONSOLE,0); */
        fd = open(DEV_CONSOLE, O_NONBLOCK);
        if (fd >= 0 && !not_vt_fd(fd))
                return fd;
@@ -73,7 +74,7 @@ static int find_free_vtno(void)
        int vtno;
        int fd = get_vt_fd();
 
-       errno = 0;
+       errno = 0;
        /*xfunc_error_retval = 3; - do we need compat? */
        if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0)
                bb_perror_msg_and_die("can't find open VT");
@@ -93,7 +94,7 @@ static NOINLINE void vfork_child(char **argv)
                /* CHILD */
                /* Try to make this VT our controlling tty */
                setsid(); /* lose old ctty */
-               ioctl(0, TIOCSCTTY, 0 /* 0: don't forcibly steal */);
+               ioctl(STDIN_FILENO, TIOCSCTTY, 0 /* 0: don't forcibly steal */);
                //bb_error_msg("our sid %d", getsid(0));
                //bb_error_msg("our pgrp %d", getpgrp());
                //bb_error_msg("VT's sid %d", tcgetsid(0));
@@ -104,9 +105,10 @@ static NOINLINE void vfork_child(char **argv)
 }
 
 int openvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int openvt_main(int argc UNUSED_PARAM, char **argv)
 {
        char vtname[sizeof(VC_FORMAT) + sizeof(int)*3];
+       struct vt_stat vtstat;
        char *str_c;
        int vtno;
        int flags;
@@ -134,13 +136,13 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
        sprintf(vtname, VC_FORMAT, vtno);
        /* (Try to) clean up stray open fds above fd 2 */
        bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS | DAEMON_ONLY_SANITIZE, NULL);
-       close(0);
+       close(STDIN_FILENO);
        /*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */
        xopen(vtname, O_RDWR);
+       xioctl(STDIN_FILENO, VT_GETSTATE, &vtstat);
 
        if (flags & OPT_s) {
-               xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)vtno);
-               xioctl(0, VT_WAITACTIVE, (void*)(ptrdiff_t)vtno);
+               console_make_active(STDIN_FILENO, vtno);
        }
 
        if (!argv[0]) {
@@ -151,21 +153,29 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
                /*argv[1] = NULL; - already is */
        }
 
-       xdup2(0, STDOUT_FILENO);
-       xdup2(0, STDERR_FILENO);
+       xdup2(STDIN_FILENO, STDOUT_FILENO);
+       xdup2(STDIN_FILENO, STDERR_FILENO);
 
 #ifdef BLOAT
+       {
        /* Handle -l (login shell) option */
        const char *prog = argv[0];
        if (flags & OPT_l)
                argv[0] = xasprintf("-%s", argv[0]);
+       }
 #endif
 
        vfork_child(argv);
        if (flags & OPT_w) {
-               wait(NULL);
-// TODO: -ws handling should be here
+               /* We have only one child, wait for it */
+               safe_waitpid(-1, NULL, 0); /* loops on EINTR */
+               if (flags & OPT_s) {
+                       console_make_active(STDIN_FILENO, vtstat.v_active);
+                       // Compat: even with -c N (try to) disallocate:
+                       // # /usr/app/kbd-1.12/bin/openvt -f -c 9 -ws sleep 5
+                       // openvt: could not deallocate console 9
+                       xioctl(STDIN_FILENO, VT_DISALLOCATE, (void*)(ptrdiff_t)vtno);
+               }
        }
-
        return EXIT_SUCCESS;
 }