Support for tar -z option for uncompressing only

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

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 1e13ff69cef561b310453195fcb12c4b51a60d68..ebdce7b24925bb7c5276ffa8ec23e8fff2973afd 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -1,50 +1,48 @@
+/* vi: set sw=4 ts=4: */
 /*
  * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s)
  * Renamed deallocvt.
  */
-#include "internal.h"
+#include "busybox.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;
 
-int
-deallocvt_main(int argc, char *argv[]) {
-    int fd, num, i;
+/* From <linux/vt.h> */
+#define VT_DISALLOCATE  0x5608  /* free memory associated to vt */
 
-    if ( ( argc != 2) || (**(argv+1) == '-' ) ) {
-       usage ("deallocvt N\n\nDeallocate unused virtual terminal /dev/ttyN\n");
-    }
+int deallocvt_main(int argc, char *argv[])
+{
+       int fd, num, i;
 
-    progname = argv[0];
+       //if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
+       if (argc > 2)
+               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) {
+printf("erik: A\n");
+               /* deallocate all unused consoles */
+               if (ioctl(fd, VT_DISALLOCATE, 0)) {
+                       perror("VT_DISALLOCATE");
+                       return EXIT_FAILURE;
+               }
+       } else
+printf("erik: B\n");
+               for (i = 1; i < argc; i++) {
+                       num = atoi(argv[i]);
+                       if (num == 0)
+                               error_msg("0: illegal VT number\n");
+                       else if (num == 1)
+                               error_msg("VT 1 cannot be deallocated\n");
+                       else if (ioctl(fd, VT_DISALLOCATE, num)) {
+                               perror("VT_DISALLOCATE");
+                               error_msg_and_die("could not deallocate console %d\n", num);
+                       }
+               }
+printf("erik: C\n");
+       return EXIT_SUCCESS;
 }