od: code shrink, fix "od --traditional FILE"

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

diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index c4746dfd3166cf1b20dbd856ce32bf8ebf90928c..de5cf93fe85c75e54dd76db0e11d01a5346cd57c 100644 (file)
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -5,9 +5,22 @@
  *  busyboxed by Quy Tonthat <quy@signal3.com>
  *  hacked by Tito <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//usage:#define openvt_trivial_usage
+//usage:       "[-c N] [-sw] [PROG ARGS]"
+//usage:#define openvt_full_usage "\n\n"
+//usage:       "Start PROG on a new virtual terminal\n"
+//usage:     "\nOptions:"
+//usage:     "\n       -c N    Use specified VT"
+//usage:     "\n       -s      Switch to the VT"
+/* //usage:     "\n    -l      Run PROG as login shell (by prepending '-')" */
+//usage:     "\n       -w      Wait for PROG to exit"
+//usage:
+//usage:#define openvt_example_usage
+//usage:       "openvt 2 /bin/ash\n"
+
 #include <linux/vt.h>
 #include "libbb.h"
 
@@ -61,8 +74,7 @@ static int get_vt_fd(void)
        for (fd = 0; fd < 3; fd++)
                if (!not_vt_fd(fd))
                        return fd;
-       /* _only_ O_NONBLOCK: ask for neither read not write perms */
-       fd = open(DEV_CONSOLE, O_NONBLOCK);
+       fd = open(DEV_CONSOLE, O_RDONLY | O_NONBLOCK);
        if (fd >= 0 && !not_vt_fd(fd))
                return fd;
        bb_error_msg_and_die("can't find open VT");
@@ -93,18 +105,17 @@ 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));
                //bb_error_msg("VT's pgrp %d", tcgetpgrp(0));
-               BB_EXECVP(argv[0], argv);
-               bb_perror_msg_and_die("exec %s", argv[0]);
+               BB_EXECVP_or_die(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;
@@ -135,32 +146,31 @@ 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(0, VT_GETSTATE, &vtstat);
+       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]) {
                argv--;
-               argv[0] = getenv("SHELL");
-               if (!argv[0])
-                       argv[0] = (char *) DEFAULT_SHELL;
+               argv[0] = (char *) get_shell_name();
                /*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);
@@ -168,12 +178,11 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
                /* We have only one child, wait for it */
                safe_waitpid(-1, NULL, 0); /* loops on EINTR */
                if (flags & OPT_s) {
-                       xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)(vtstat.v_active));
-                       xioctl(0, VT_WAITACTIVE, (void*)(ptrdiff_t)(vtstat.v_active));
+                       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(0, VT_DISALLOCATE, (void*)(ptrdiff_t)vtno);
+                       xioctl(STDIN_FILENO, VT_DISALLOCATE, (void*)(ptrdiff_t)vtno);
                }
        }
        return EXIT_SUCCESS;