patch to Vanilla Tomato 1.28

1 files changed, 23 insertions, 36 deletions

diff --git a/release/src/router/busybox/console-tools/deallocvt.c b/release/src/router/busybox/console-tools/deallocvt.c
index f641be8d..09748834 100644
--- a/release/src/router/busybox/console-tools/deallocvt.c
+++ b/release/src/router/busybox/console-tools/deallocvt.c
@@ -1,46 +1,33 @@
 /* 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 <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include "busybox.h"
 
-/* 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=0;
+/* no options, no getopt */
 
-	if (argc > 2)
-		bb_show_usage();
+#include "libbb.h"
 
-	fd = get_console_fd();
-	
-	/*  num=0  deallocate all unused consoles */
-	if (argc == 1)
-		goto disallocate_all;
+/* From <linux/vt.h> */
+enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
 
-	num=bb_xgetlarg(argv[1], 10, 0, INT_MAX);
+int deallocvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int deallocvt_main(int argc UNUSED_PARAM, char **argv)
+{
+	/* num = 0 deallocate all unused consoles */
+	int num = 0;
 
-	switch(num)
-	{
-		case 0:
-			bb_error_msg("0: illegal VT number");
-			break;
-		case 1:
-			bb_error_msg("VT 1 cannot be deallocated");
-			break;
-		default:
-disallocate_all:
-			if (ioctl(fd, VT_DISALLOCATE, num))
-				bb_perror_msg_and_die("VT_DISALLOCATE");
-			return EXIT_SUCCESS;
+	if (argv[1]) {
+		if (argv[2])
+			bb_show_usage();
+		num = xatou_range(argv[1], 1, 63);
 	}
-	return EXIT_FAILURE;
+
+	/* double cast suppresses "cast to ptr from int of different size" */
+	xioctl(get_console_fd_or_die(), VT_DISALLOCATE, (void *)(ptrdiff_t)num);
+	return EXIT_SUCCESS;
 }