svn commit: trunk/busybox: init shell

vda at busybox.net vda at busybox.net
Mon Dec 10 08:40:31 UTC 2007


Author: vda
Date: 2007-12-10 00:40:29 -0800 (Mon, 10 Dec 2007)
New Revision: 20636

Log:
cttyhack: add missing ';'
init: remove pointless access() check



Modified:
   trunk/busybox/init/init.c
   trunk/busybox/shell/cttyhack.c


Changeset:
Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c	2007-12-10 07:06:04 UTC (rev 20635)
+++ trunk/busybox/init/init.c	2007-12-10 08:40:29 UTC (rev 20636)
@@ -513,11 +513,13 @@
 	for (a = init_action_list; a; a = tmp) {
 		tmp = a->next;
 		if (a->action == action) {
-			/* a->terminal of "" means "init's console" */
-			if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
-				//message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
-				delete_init_action(a);
-			} else if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
+			// Pointless: run() will error out if open of device fails.
+			///* a->terminal of "" means "init's console" */
+			//if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
+			//	//message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
+			//	delete_init_action(a);
+			//} else
+			if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
 				waitfor(run(a));
 				delete_init_action(a);
 			} else if (a->action & ONCE) {

Modified: trunk/busybox/shell/cttyhack.c
===================================================================
--- trunk/busybox/shell/cttyhack.c	2007-12-10 07:06:04 UTC (rev 20635)
+++ trunk/busybox/shell/cttyhack.c	2007-12-10 08:40:29 UTC (rev 20636)
@@ -69,7 +69,7 @@
 		dup2(fd, 2);
 		while (fd > 2) close(fd--);
 		/* Some other session may have it as ctty. Steal it from them */
-		ioctl(0, TIOCSCTTY, 1)
+		ioctl(0, TIOCSCTTY, 1);
 	}
 
 	BB_EXECVP(argv[0], argv);




More information about the busybox-cvs mailing list