forgot about avn add... :(

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

diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index 3373edd294f36cfebf326e77bb213dd7f92f9ee6..f1cf5645b3fb396224f7bfd6b03466dd2d3b2f3b 100644 (file)
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -1,84 +1,45 @@
 /* vi: set sw=4 ts=4: */
-
 /*
- * openvt.c - open a vt to run a command.
+ *  openvt.c - open a vt to run a command.
+ *
+ *  busyboxed by Quy Tonthat <quy@signal3.com>
+ *  hacked by Tito <farmatito@tiscali.it>
  *
- * busyboxed by Quy Tonthat <quy@signal3.com>
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* getopt not needed */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/types.h>
 #include "busybox.h"
 
-#define VTNAME "/dev/tty%d"
-
 int openvt_main(int argc, char **argv)
 {
-       int pid;
        int fd;
-       int vtno;
-       char vtname[sizeof VTNAME + 2];
-       char * cmd = NULL;
-       char * cmd_args = NULL;
-
-       if (argc < 3)
-        show_usage();
-
-       if (!isdigit(argv[1][0]))
-               show_usage();
-
-       vtno = (int) atol(argv[1]);
+       char vtname[sizeof(VC_FORMAT) + 2];
 
-       /* if (vtno <= 0 || vtno > 63) */
-       if (vtno <= 0 || vtno > 12)
-               error_msg_and_die("Illegal vt number (%d)", vtno);        
 
-       sprintf(vtname, VTNAME, vtno);
-
-       cmd = argv[2];
-       cmd_args = xmalloc(80);
-       cmd_args[0] = '\0';
+       if (argc < 3) {
+               bb_show_usage();
+       }
+       /* check for illegal vt number: < 1 or > 63 */
+       sprintf(vtname, VC_FORMAT, (int)xatoul_range(argv[1], 1, 63));
 
-       if((pid = fork()) == 0) {
+       if (fork() == 0) {
                /* leave current vt */
-
-#ifdef   ESIX_5_3_2_D
-               if (setpgrp() < 0) {
-#else
                if (setsid() < 0) {
-#endif
-
-                       perror_msg_and_die("Unable to set new session");          
+                       bb_perror_msg_and_die("setsid");
                }
                close(0);                       /* so that new vt becomes stdin */
 
                /* and grab new one */
-               if ((fd = open(vtname, O_RDWR)) == -1)
-                       perror_msg_and_die("could not open %s", vtname);          
+               fd = xopen(vtname, O_RDWR);
 
                /* Reassign stdout and sterr */
-               close(1);
-               close(2);
-               dup(fd);
-               dup(fd);
+               dup2(fd, STDOUT_FILENO);
+               dup2(fd, STDERR_FILENO);
 
-               execvp(cmd, &argv[2]);
-               /*execlp(cmd, cmd_args);*/
+               execvp(argv[2], &argv[2]);
                _exit(1);
        }
        return EXIT_SUCCESS;
 }
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/