X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=console-tools%2Fdeallocvt.c;h=b7dcc9e223761fabe256c0706dd867c511e8286a;hb=9c60b290717e3ff1b9a8e09da4abe6f46964aa82;hp=9c477d23802b09916b0af96ca49e0ba92e4f67b2;hpb=bf181b9338152759fd56c8009e9a962a84808e7c;p=oweals%2Fbusybox.git

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 9c477d238..b7dcc9e22 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -3,43 +3,41 @@
  * 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 "busybox.h"
 
 /* From <linux/vt.h> */
-#define VT_DISALLOCATE  0x5608  /* free memory associated to vt */
+static const int 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);
+	//if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
+	if (argc > 2)
+		show_usage();
 
-	fd = get_console_fd("/dev/console");
+	fd = get_console_fd();
 
 	if (argc == 1) {
 		/* deallocate all unused consoles */
-		if (ioctl(fd, VT_DISALLOCATE, 0)) {
-			perror("VT_DISALLOCATE");
-			exit( FALSE);
-		}
-	} else
+		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)
-				errorMsg("0: illegal VT number\n");
+				error_msg("0: illegal VT number");
 			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);
-			}
+				error_msg("VT 1 cannot be deallocated");
+			else if (ioctl(fd, VT_DISALLOCATE, num))
+				perror_msg_and_die("VT_DISALLOCATE");
 		}
-	return( TRUE);
+	}
+
+	return EXIT_SUCCESS;
 }