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 bf1ed609bf005bce75769d1cf8e2c364fc01863a..07e58c3b8ab13bc9938746cb1e38ce890e30b0c6 100644 (file)
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -1,48 +1,17 @@
 /* vi: set sw=4 ts=4: */
 /*
- * chvt.c - aeb - 940227 - Change virtual terminal
+ * Mini chvt implementation for busybox
  *
- * busyboxed by Erik Andersen
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-#include "internal.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <linux/vt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-extern int getfd(void);
+#include "libbb.h"
 
-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) || (**(argv + 1) == '-')) {
-               usage ("chvt N\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-                               "\nChanges the foreground virtual terminal to /dev/ttyN\n"
-#endif
-                               );
-       }
-       fd = get_console_fd("/dev/console");
-       num = atoi(argv[1]);
-       if (ioctl(fd, VT_ACTIVATE, num)) {
-               perror("VT_ACTIVATE");
-               exit(FALSE);
-       }
-       if (ioctl(fd, VT_WAITACTIVE, num)) {
-               perror("VT_WAITACTIVE");
-               exit(FALSE);
-       }
-       exit(TRUE);
+       int num = xatou_range(single_argv(argv), 1, 63);
+       console_make_active(get_console_fd_or_die(), num);
+       return EXIT_SUCCESS;
 }
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/