Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/console-tools/deallocvt.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/console-tools/deallocvt.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/console-tools/deallocvt.c

@@ -6 +6 @@
  * 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.
  */
 
@@ -16 +16 @@
 enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
 
-int deallocvt_main(int argc, char **argv);
-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:
+    if (argv[1]) {
+        if (argv[2])
+            bb_show_usage();
         num = xatou_range(argv[1], 1, 63);
-        /* Fallthrough */
-    case 1:
-        break;
-    default:
-        bb_show_usage();
     }
 
-    /* double cast suppresses "cast to ptr from int of different size */
-    xioctl(get_console_fd(), VT_DISALLOCATE, (void *)(ptrdiff_t)num);
+    /* 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;
 }