minor fixes for fbset bloat

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

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index ae4dbb5a8cc93f4d288f9f983cf0b78d6fa88b28..15cd0c9b9a76b3087f795887f0f869485b2a6b6e 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -1,48 +1,43 @@
+/* vi: set sw=4 ts=4: */
 /*
  * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s)
  * Renamed deallocvt.
  */
-#include "internal.h"
 #include <stdlib.h>
+#include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <linux/vt.h>
-#include <stdio.h>
+#include "busybox.h"
 
-extern int getfd(void);
-char *progname;
+/* From <linux/vt.h> */
+static const int VT_DISALLOCATE = 0x5608;  /* free memory associated to vt */
 
-int
-deallocvt_main(int argc, char *argv[]) {
-    int fd, num, i;
+int deallocvt_main(int argc, char *argv[])
+{
+       int fd, num, i;
 
-    if (argc < 1)              /* unlikely */
-      exit(1);
-    progname = argv[0];
+       //if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
+       if (argc > 2)
+               show_usage();
 
-    fd = get_console_fd("/dev/console");
+       fd = get_console_fd("/dev/console");
 
-    if (argc == 1) {
-       /* deallocate all unused consoles */
-       if (ioctl(fd,VT_DISALLOCATE,0)) {
-           perror("VT_DISALLOCATE");
-           exit(1);
+       if (argc == 1) {
+               /* deallocate all unused consoles */
+               if (ioctl(fd, VT_DISALLOCATE, 0))
+                       perror_msg_and_die("VT_DISALLOCATE");
+       } else {
+               for (i = 1; i < argc; i++) {
+                       num = atoi(argv[i]);
+                       if (num == 0)
+                               error_msg("0: illegal VT number");
+                       else if (num == 1)
+                               error_msg("VT 1 cannot be deallocated");
+                       else if (ioctl(fd, VT_DISALLOCATE, num))
+                               perror_msg_and_die("VT_DISALLOCATE");
+               }
        }
-    } else
-    for (i = 1; i < argc; i++) {
-       num = atoi(argv[i]);
-       if (num == 0)
-           fprintf(stderr, "%s: 0: illegal VT number\n", progname);
-       else if (num == 1)
-           fprintf(stderr, "%s: VT 1 cannot be deallocated\n", progname);
-       else
-       if (ioctl(fd,VT_DISALLOCATE,num)) {
-           perror("VT_DISALLOCATE");
-           fprintf(stderr, "%s: could not deallocate console %d\n",
-                   progname, num);
-           exit(1);
-       }
-    }
-    exit(0);
+
+       return EXIT_SUCCESS;
 }