Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/console-tools/chvt.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/console-tools/chvt.c (modified) (1 diff)

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

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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.
  */
-
 #include "libbb.h"
 
-/* From <linux/vt.h> */
-enum {
-    VT_ACTIVATE = 0x5606,   /* make vt active */
-    VT_WAITACTIVE = 0x5607  /* wait for vt active */
-};
-
-int chvt_main(int argc, char **argv);
-int chvt_main(int argc, char **argv)
+int chvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chvt_main(int argc UNUSED_PARAM, char **argv)
 {
-    int fd, num;
-
-    if (argc != 2) {
-        bb_show_usage();
-    }
-
-    fd = get_console_fd();
-    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);
+    int num = xatou_range(single_argv(argv), 1, 63);
+    console_make_active(get_console_fd_or_die(), num);
     return EXIT_SUCCESS;
 }