svn commit: trunk/busybox/runit

[vda at busybox.net]

Author: vda
Date: 2008-11-11 01:33:24 -0800 (Tue, 11 Nov 2008)
New Revision: 23996

Log:
runsvdir: straighten some convoluted code. logic is unchanged



Modified:
   trunk/busybox/runit/runsvdir.c


Changeset:
Modified: trunk/busybox/runit/runsvdir.c
===================================================================
--- trunk/busybox/runit/runsvdir.c	2008-11-11 02:56:39 UTC (rev 23995)
+++ trunk/busybox/runit/runsvdir.c	2008-11-11 09:33:24 UTC (rev 23996)
@@ -377,19 +377,17 @@
 			}
 		}
 
-		switch (bb_got_signal) {
-		case SIGHUP:
+		if (bb_got_signal == SIGHUP) {
 			for (i = 0; i < svnum; i++)
 				if (sv[i].pid)
 					kill(sv[i].pid, SIGTERM);
-			/* Fall through */
-		default: /* SIGTERM (or SIGUSRn if we are init) */
-			/* Exit unless we are init */
-			if (getpid() == 1)
-				break;
-			return (SIGHUP == bb_got_signal) ? 111 : EXIT_SUCCESS;
 		}
+		/* SIGHUP or SIGTERM (or SIGUSRn if we are init) */
+		/* Exit unless we are init */
+		if (getpid() != 1)
+			return (SIGHUP == bb_got_signal) ? 111 : EXIT_SUCCESS;
 
+		/* init continues to monitor services forever */
 		bb_got_signal = 0;
 	} /* for (;;) */
 }