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 042de8649f2dff5ae20412417d5f54a1754850f1..cd581b1c835f457685a7ced0060ed591668c0250 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -1,52 +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 "internal.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
 
-/* From <linux/vt.h> */
-#define VT_DISALLOCATE  0x5608  /* free memory associated to vt */
+/* no options, no getopt */
+
+#include "busybox.h"
 
-const char deallocvt_usage[] =
-       "deallocvt N\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-        "\nDeallocate unused virtual terminal /dev/ttyN\n"
-#endif
-        ;
+/* From <linux/vt.h> */
+enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
 
 int deallocvt_main(int argc, char *argv[])
 {
-       int fd, num, i;
-
-       if ((argc != 2) || (**(argv + 1) == '-'))
-               usage(deallocvt_usage);
+       /* num = 0 deallocate all unused consoles */
+       int num = 0;
 
-       fd = get_console_fd("/dev/console");
+       switch (argc) {
+       case 2:
+               num = xatoul_range(argv[1], 1, 63);
+               /* Fallthrough */
+       case 1:
+               break;
+       default:
+               bb_show_usage();
+       }
 
-       if (argc == 1) {
-               /* deallocate all unused consoles */
-               if (ioctl(fd, VT_DISALLOCATE, 0)) {
-                       perror("VT_DISALLOCATE");
-                       exit( FALSE);
-               }
-       } else
-               for (i = 1; i < argc; i++) {
-                       num = atoi(argv[i]);
-                       if (num == 0)
-                               errorMsg("0: illegal VT number\n");
-                       else if (num == 1)
-                               errorMsg("VT 1 cannot be deallocated\n");
-                       else if (ioctl(fd, VT_DISALLOCATE, num)) {
-                               perror("VT_DISALLOCATE");
-                               errorMsg("could not deallocate console %d\n", num);
-                               exit( FALSE);
-                       }
-               }
-       return( TRUE);
+       if (-1 == ioctl(get_console_fd(), VT_DISALLOCATE, num)) {
+               bb_perror_msg_and_die("VT_DISALLOCATE");
+       }
+       return EXIT_SUCCESS;
 }