Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/console-tools/openvt.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/console-tools/openvt.c (modified) (1 diff)

branches/2.2.5/mindi-busybox/console-tools/openvt.c

@@ -11 +11 @@
 /* getopt not needed */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/types.h>
-#include <ctype.h>
+#include "libbb.h"
 
-#include "busybox.h"
-
+int openvt_main(int argc, char **argv);
 int openvt_main(int argc, char **argv)
 {
-    int fd;
     char vtname[sizeof(VC_FORMAT) + 2];
 
+    if (argc < 3)
+        bb_show_usage();
 
-    if (argc < 3) {
-        bb_show_usage();
-    }
-    /* check for Illegal vt number: < 1 or > 12 */
-    sprintf(vtname, VC_FORMAT, (int)bb_xgetlarg(argv[1], 10, 1, 12));
+    /* check for illegal vt number: < 1 or > 63 */
+    sprintf(vtname, VC_FORMAT, (int)xatou_range(argv[1], 1, 63));
 
-    if (fork() == 0) {
-        /* leave current vt */
-        if (setsid() < 0) {
-            bb_perror_msg_and_die("setsid");
-        }
-        close(0);           /* so that new vt becomes stdin */
+    bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, argv);
+    /* grab new one */
+    close(0);
+    xopen(vtname, O_RDWR);
+    dup2(0, STDOUT_FILENO);
+    dup2(0, STDERR_FILENO);
 
-        /* and grab new one */
-        fd = bb_xopen(vtname, O_RDWR);
-
-        /* Reassign stdout and sterr */
-        dup2(fd, STDOUT_FILENO);
-        dup2(fd, STDERR_FILENO);
-
-        execvp(argv[2], &argv[2]);
-        _exit(1);
-    }
-    return EXIT_SUCCESS;
+    BB_EXECVP(argv[2], &argv[2]);
+    _exit(1);
 }