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

Timestamp:

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

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/console-tools/chvt.c (modified) (3 diffs)

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

@@ -8 +8 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* From <linux/vt.h> */
@@ -21 +16 @@
 };
 
+int chvt_main(int argc, char **argv);
 int chvt_main(int argc, char **argv)
 {
@@ -30 +26 @@
 
     fd = get_console_fd();
-    num =  bb_xgetlarg(argv[1], 10, 0, INT_MAX);
-    if ((-1 == ioctl(fd, VT_ACTIVATE, num))
-    || (-1 == ioctl(fd, VT_WAITACTIVE, num))) {
-        bb_perror_msg_and_die("ioctl");
-    }
+    num = xatou_range(argv[1], 1, 63);
+    /* double cast suppresses "cast to ptr from int of different size */
+    xioctl(fd, VT_ACTIVATE, (void *)(ptrdiff_t)num);
+    xioctl(fd, VT_WAITACTIVE, (void *)(ptrdiff_t)num);
     return EXIT_SUCCESS;
 }