svn commit: trunk/busybox/console-tools

[landley at busybox.net]

Author: landley
Date: 2005-09-07 20:27:06 -0700 (Wed, 07 Sep 2005)
New Revision: 11390

Log:
Tito sent more size tweaks.


Modified:
   trunk/busybox/console-tools/chvt.c
   trunk/busybox/console-tools/deallocvt.c
   trunk/busybox/console-tools/openvt.c
   trunk/busybox/console-tools/setconsole.c


Changeset:
Modified: trunk/busybox/console-tools/chvt.c
===================================================================
--- trunk/busybox/console-tools/chvt.c	2005-09-08 03:26:31 UTC (rev 11389)
+++ trunk/busybox/console-tools/chvt.c	2005-09-08 03:27:06 UTC (rev 11390)
@@ -42,12 +42,10 @@
 
 	fd = get_console_fd();
 	num =  bb_xgetlarg(argv[1], 10, 0, INT_MAX);
-	if (ioctl(fd, VT_ACTIVATE, num)) {
-		bb_perror_msg_and_die("VT_ACTIVATE");
+	if((-1 == ioctl(fd, VT_ACTIVATE, num)) ||
+	   (-1 == ioctl(fd, VT_WAITACTIVE, num))) {
+		bb_perror_msg_and_die("ioctl");
 	}
-	if (ioctl(fd, VT_WAITACTIVE, num)) {
-		bb_perror_msg_and_die("VT_WAITACTIVE");
-	}
 	return EXIT_SUCCESS;
 }
 

Modified: trunk/busybox/console-tools/deallocvt.c
===================================================================
--- trunk/busybox/console-tools/deallocvt.c	2005-09-08 03:26:31 UTC (rev 11389)
+++ trunk/busybox/console-tools/deallocvt.c	2005-09-08 03:27:06 UTC (rev 11390)
@@ -42,14 +42,14 @@
 		case 2:
 			if((num = bb_xgetlarg(argv[1], 10, 0, INT_MAX)) == 0)
 				bb_error_msg_and_die("0: illegal VT number");
-		/* Falltrough */
+		/* Fallthrough */
 		case 1:
 			break;
 		default:
 			bb_show_usage();
 	}
 
-	if (ioctl( get_console_fd(), VT_DISALLOCATE, num )) {
+	if (-1 == ioctl( get_console_fd(), VT_DISALLOCATE, num )) {
 		bb_perror_msg_and_die("VT_DISALLOCATE");
 	}
 	return EXIT_SUCCESS;

Modified: trunk/busybox/console-tools/openvt.c
===================================================================
--- trunk/busybox/console-tools/openvt.c	2005-09-08 03:26:31 UTC (rev 11389)
+++ trunk/busybox/console-tools/openvt.c	2005-09-08 03:27:06 UTC (rev 11390)
@@ -64,10 +64,8 @@
 		fd = bb_xopen(vtname, O_RDWR);
 
 		/* Reassign stdout and sterr */
-		close(1);
-		close(2);
-		dup(fd);
-		dup(fd);
+		dup2(fd, STDOUT_FILENO);
+		dup2(fd, STDERR_FILENO);
 
 		execvp(argv[0], argv);
 		_exit(1);

Modified: trunk/busybox/console-tools/setconsole.c
===================================================================
--- trunk/busybox/console-tools/setconsole.c	2005-09-08 03:26:31 UTC (rev 11389)
+++ trunk/busybox/console-tools/setconsole.c	2005-09-08 03:27:06 UTC (rev 11390)
@@ -37,9 +37,8 @@
 
 int setconsole_main(int argc, char **argv)
 {
-	int con;
 	unsigned long flags;
-	const char *device = "/dev/tty";
+	const char *device = CURRENT_TTY;
 
 	bb_applet_long_options = setconsole_long_options;
 	flags = bb_getopt_ulflags(argc, argv, "r");
@@ -53,15 +52,12 @@
 		device = argv[optind];
 	} else {
 		if (flags & OPT_SETCONS_RESET)
-			device = "/dev/console";
+			device = CONSOLE_DEV;
 	}
 
-	if (-1 == (con = open(device, O_RDONLY))) {
-		bb_perror_msg_and_die("open %s", device);
+	if (-1 == ioctl(bb_xopen(device, O_RDONLY), TIOCCONS)) {
+		bb_perror_msg_and_die("TIOCCONS");
 	}
-	if (-1 == ioctl(con, TIOCCONS)) {
-		bb_perror_msg_and_die("ioctl TIOCCONS");
-	}
 	return EXIT_SUCCESS;
 }