[BusyBox-cvs] svn commit: trunk/busybox/init

[vapier at busybox.net]

Author: vapier
Date: 2005-07-05 23:00:48 -0600 (Tue, 05 Jul 2005)
New Revision: 10723

Log:
move var decls around a little to help gcc make smaller code

Modified:
   trunk/busybox/init/init.c


Changeset:
Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c	2005-07-06 04:46:14 UTC (rev 10722)
+++ trunk/busybox/init/init.c	2005-07-06 05:00:48 UTC (rev 10723)
@@ -424,9 +424,8 @@
 
 static pid_t run(const struct init_action *a)
 {
-	struct stat sb;
 	int i, junk;
-	pid_t pid, pgrp, tmp_pid;
+	pid_t pid;
 	char *s, *tmpCmd, *cmd[INIT_BUFFS_SIZE], *cmdpath;
 	char buf[INIT_BUFFS_SIZE + 6];	/* INIT_BUFFS_SIZE+strlen("exec ")+1 */
 	sigset_t nmask, omask;
@@ -442,6 +441,8 @@
 	sigprocmask(SIG_BLOCK, &nmask, &omask);
 
 	if ((pid = fork()) == 0) {
+		struct stat sb;
+
 		/* Clean up */
 		close(0);
 		close(1);
@@ -466,11 +467,10 @@
 		/* Open the new terminal device */
 		if ((device_open(a->terminal, O_RDWR)) < 0) {
 			if (stat(a->terminal, &sb) != 0) {
-				message(LOG | CONSOLE, "device '%s' does not exist.",
-						a->terminal);
-				_exit(1);
+				message(LOG | CONSOLE, "device '%s' does not exist.", a->terminal);
+			} else {
+				message(LOG | CONSOLE, "Bummer, can't open %s", a->terminal);
 			}
-			message(LOG | CONSOLE, "Bummer, can't open %s", a->terminal);
 			_exit(1);
 		}
 
@@ -484,6 +484,7 @@
 		/* If the init Action requires us to wait, then force the
 		 * supplied terminal to be the controlling tty. */
 		if (a->action & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
+			pid_t pgrp, tmp_pid;
 
 			/* Now fork off another process to just hang around */
 			if ((pid = fork()) < 0) {
@@ -733,8 +734,6 @@
 	for (a = init_action_list; a; a = tmp) {
 		tmp = a->next;
 		if (a->action & RESTART) {
-			struct stat sb;
-
 			shutdown_system();
 
 			/* unblock all signals, blocked in shutdown_system() */
@@ -758,6 +757,7 @@
 
 			/* Open the new terminal device */
 			if ((device_open(a->terminal, O_RDWR)) < 0) {
+				struct stat sb;
 				if (stat(a->terminal, &sb) != 0) {
 					message(LOG | CONSOLE, "device '%s' does not exist.", a->terminal);
 				} else {