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

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

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index cd581b1c835f457685a7ced0060ed591668c0250..6a1d13d149e3496e18ccb1aad248922afb8330f2 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -5,33 +5,29 @@
  * Copyright (C) 2003 by Tito Ragusa <farmatito@tiscali.it>
  * 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.
  */
 
 /* no options, no getopt */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* From <linux/vt.h> */
 enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
 
-int deallocvt_main(int argc, char *argv[])
+int deallocvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int deallocvt_main(int argc UNUSED_PARAM, char **argv)
 {
        /* num = 0 deallocate all unused consoles */
        int num = 0;
 
-       switch (argc) {
-       case 2:
-               num = xatoul_range(argv[1], 1, 63);
-               /* Fallthrough */
-       case 1:
-               break;
-       default:
-               bb_show_usage();
+       if (argv[1]) {
+               if (argv[2])
+                       bb_show_usage();
+               num = xatou_range(argv[1], 1, 63);
        }
 
-       if (-1 == ioctl(get_console_fd(), VT_DISALLOCATE, num)) {
-               bb_perror_msg_and_die("VT_DISALLOCATE");
-       }
+       /* double cast suppresses "cast to ptr from int of different size" */
+       xioctl(get_console_fd_or_die(), VT_DISALLOCATE, (void *)(ptrdiff_t)num);
        return EXIT_SUCCESS;
 }