Bugfixes

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

diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index c4b3639df75abd5020031dd52d3e60bfa338be35..3398892f5e0a3c2dd7c5e02066538def6b9d2731 100644 (file)
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -1,9 +1,26 @@
 /* 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>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+/* no options, no getopt */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -19,14 +36,18 @@ int chvt_main(int argc, char **argv)
 {
        int fd, num;
 
-       if ((argc != 2) || (**(argv + 1) == '-'))
-               show_usage();
-       fd = get_console_fd("/dev/console");
-       num = atoi(argv[1]);
-       if (ioctl(fd, VT_ACTIVATE, num))
-               perror_msg_and_die("VT_ACTIVATE");
-       if (ioctl(fd, VT_WAITACTIVE, num))
-               perror_msg_and_die("VT_WAITACTIVE");
+       if (argc != 2) {
+               bb_show_usage();
+       }
+
+       fd = get_console_fd();
+       num =  bb_xgetlarg(argv[1], 10, 0, INT_MAX);
+       if (ioctl(fd, VT_ACTIVATE, num)) {
+               bb_perror_msg_and_die("VT_ACTIVATE");
+       }
+       if (ioctl(fd, VT_WAITACTIVE, num)) {
+               bb_perror_msg_and_die("VT_WAITACTIVE");
+       }
        return EXIT_SUCCESS;
 }