Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/console-tools/deallocvt.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

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

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

@@ -6 +6 @@
  * 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
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* no options, no getopt */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#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);
+int deallocvt_main(int argc, char **argv)
 {
     /* num = 0 deallocate all unused consoles */
@@ -39 +23 @@
 
     switch (argc) {
-        case 2:
-            if ((num = bb_xgetlarg(argv[1], 10, 0, INT_MAX)) == 0) {
-                bb_error_msg_and_die("0: illegal VT number");
-            }
+    case 2:
+        num = xatou_range(argv[1], 1, 63);
         /* Fallthrough */
-        case 1:
-            break;
-        default:
-            bb_show_usage();
+    case 1:
+        break;
+    default:
+        bb_show_usage();
     }
 
-    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(), VT_DISALLOCATE, (void *)(ptrdiff_t)num);
     return EXIT_SUCCESS;
 }