lineedit: do not hang on error, but return error indicator.

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

diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index bbc5a9c31d1dd6bad85ca1575265bdbed4498044..07e58c3b8ab13bc9938746cb1e38ce890e30b0c6 100644 (file)
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -4,30 +4,14 @@
  *
  * 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"
 
-#include "busybox.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) 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 = xatoul_range(argv[1], 1, 63);
-       if ((-1 == ioctl(fd, VT_ACTIVATE, num))
-       || (-1 == ioctl(fd, VT_WAITACTIVE, num))) {
-               bb_perror_msg_and_die("ioctl");
-       }
+       int num = xatou_range(single_argv(argv), 1, 63);
+       console_make_active(get_console_fd_or_die(), num);
        return EXIT_SUCCESS;
 }