ip: "ip addr del" and "ip addr delete" both should work

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

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index f641be8d76a34101f16b4ed15f74aa528db17506..cd581b1c835f457685a7ced0060ed591668c0250 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -1,46 +1,37 @@
 /* vi: set sw=4 ts=4: */
 /*
- * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s)
- * Renamed deallocvt.
+ * Disallocate virtual terminal(s)
+ *
+ * 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.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
+
+/* no options, no getopt */
+
 #include "busybox.h"
 
 /* From <linux/vt.h> */
-static const int VT_DISALLOCATE = 0x5608;  /* free memory associated to vt */
+enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
 
 int deallocvt_main(int argc, char *argv[])
 {
-       int fd, num=0;
+       /* num = 0 deallocate all unused consoles */
+       int num = 0;
 
-       if (argc > 2)
+       switch (argc) {
+       case 2:
+               num = xatoul_range(argv[1], 1, 63);
+               /* Fallthrough */
+       case 1:
+               break;
+       default:
                bb_show_usage();
+       }
 
-       fd = get_console_fd();
-       
-       /*  num=0  deallocate all unused consoles */
-       if (argc == 1)
-               goto disallocate_all;
-
-       num=bb_xgetlarg(argv[1], 10, 0, INT_MAX);
-
-       switch(num)
-       {
-               case 0:
-                       bb_error_msg("0: illegal VT number");
-                       break;
-               case 1:
-                       bb_error_msg("VT 1 cannot be deallocated");
-                       break;
-               default:
-disallocate_all:
-                       if (ioctl(fd, VT_DISALLOCATE, num))
-                               bb_perror_msg_and_die("VT_DISALLOCATE");
-                       return EXIT_SUCCESS;
+       if (-1 == ioctl(get_console_fd(), VT_DISALLOCATE, num)) {
+               bb_perror_msg_and_die("VT_DISALLOCATE");
        }
-       return EXIT_FAILURE;
+       return EXIT_SUCCESS;
 }