[PATCH]: libbb/get_console.c, aesthetics and typo ("choise")

[Robert P. J. Day]

diff -pru busybox.orig/libbb/get_console.c busybox/libbb/get_console.c
--- busybox.orig/libbb/get_console.c	2006-03-25 17:07:09.000000000 -0500
+++ busybox/libbb/get_console.c	2006-03-26 06:39:04.000000000 -0500
@@ -27,25 +27,19 @@
 #include <sys/ioctl.h>
 #include "libbb.h"

-
-
 /* From <linux/kd.h> */
 enum { KDGKBTYPE = 0x4B33 };  /* get keyboard type */

-
 static int open_a_console(const char *fnam)
 {
 	int fd;

-	/* try read-write */
-	fd = open(fnam, O_RDWR);
+	fd = open(fnam, O_RDWR);				/* first, try read/write */

-	/* if failed, try read-only */
-	if (fd < 0 && errno == EACCES)
+	if (fd < 0 && errno == EACCES)			/* else, try readonly */
 		fd = open(fnam, O_RDONLY);

-	/* if failed, try write-only */
-	if (fd < 0 && errno == EACCES)
+	if (fd < 0 && errno == EACCES)			/* else, try writeonly */
 		fd = open(fnam, O_WRONLY);

 	return fd;
@@ -61,22 +55,22 @@ int get_console_fd(void)
 {
 	int fd;

-	static const char * const choise_console_names[] = {
+	static const char * const choose_console_names[] = {
 		CONSOLE_DEV, CURRENT_VC, CURRENT_TTY
 	};

 	for (fd = 2; fd >= 0; fd--) {
 		int fd4name;
-		int choise_fd;
+		int choose_fd;
 		char arg;

-		fd4name = open_a_console(choise_console_names[fd]);
+		fd4name = open_a_console(choose_console_names[fd]);
 	chk_std:
-		choise_fd = fd4name >= 0 ? fd4name : fd;
+		choose_fd = fd4name >= 0 ? fd4name : fd;

 		arg = 0;
-		if (ioctl(choise_fd, KDGKBTYPE, &arg) == 0)
-			return choise_fd;
+		if (ioctl(choose_fd, KDGKBTYPE, &arg) == 0)
+			return choose_fd;
 		if(fd4name >= 0) {
 			close(fd4name);
 			fd4name = -1;

Signed off by:  Robert P. J. Day <rpjday at mindspring.com>