find:: get rid of nested function (it's a gcc-ism)

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

diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index ea96d136002a7a51f129e919d8a74ac1871582c2..b9c974f4a49e9f29b1d7ad3fbc355b24f4b72858 100644 (file)
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -4,30 +4,20 @@
  *
  * 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"
+//usage:#define chvt_trivial_usage
+//usage:       "N"
+//usage:#define chvt_full_usage "\n\n"
+//usage:       "Change the foreground virtual terminal to /dev/ttyN"
 
-/* From <linux/vt.h> */
-enum {
-       VT_ACTIVATE = 0x5606,   /* make vt active */
-       VT_WAITACTIVE = 0x5607  /* wait for vt active */
-};
+#include "libbb.h"
 
 int chvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chvt_main(int argc, char **argv)
+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;
 }