Fixed a stupid thinko preventing zcat from doing its job, thanks

[oweals/busybox.git] / deallocvt.c

diff --git a/deallocvt.c b/deallocvt.c
index ae4dbb5a8cc93f4d288f9f983cf0b78d6fa88b28..9c477d23802b09916b0af96ca49e0ba92e4f67b2 100644 (file)
--- a/deallocvt.c
+++ b/deallocvt.c
@@ -1,48 +1,45 @@
+/* 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>
 
-extern int getfd(void);
-char *progname;
+/* From <linux/vt.h> */
+#define 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 + 1) == '-'))
+               usage(deallocvt_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);
-       }
-    } 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);
+       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);
 }