From 02a39a34976b5c699ba96f4b7d42b7d88b0c772d Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 6 Apr 2009 21:00:01 +0000
Subject: [PATCH] * Changed the WIFEXITED logic to eliminate duplicate code.

---
 citadel/sysdep.c | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index ac654ac52..9af1a5789 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -960,35 +960,19 @@ void start_daemon(int unused) {
 		}
 		do_restart = 0;
 		nFireUpsNonRestart = nFireUps;
-		/* Did the main process exit with an actual exit code? */
-		if (WIFEXITED(status)) {
 		
-			CtdlLogPrintf(CTDL_DEBUG, " WIFEXITED! \n");
-
-			/* Exit code 0 means the watcher should exit */
-			if (WEXITSTATUS(status) == CTDLEXIT_SHUTDOWN) {
-				CtdlLogPrintf(CTDL_DEBUG, " CTDLEXIT_SHUTDOWN \n");
-				do_restart = 0;
-			}
-
-			/* Exit code 101-109 means the watcher should exit */
-			else if ( (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109) ) {
-				CtdlLogPrintf(CTDL_DEBUG, " CTDLEXIT NO RESTART \n");
-				do_restart = 0;
-			}
+		/* Exit code 0 means the watcher should exit */
+		if (WIFEXITED(status) && (WEXITSTATUS(status) == CTDLEXIT_SHUTDOWN)) {
+			do_restart = 0;
+		}
 
-			/* Any other exit code means we should restart. */
-			else {
-				CtdlLogPrintf(CTDL_DEBUG, " ANY OTHER EXIT CODE \n");
-				do_restart = 1;
-				nFireUps++;
-				ForkedPid = current_child;
-			}
+		/* Exit code 101-109 means the watcher should exit */
+		else if (WIFEXITED(status) && (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109)) {
+			do_restart = 0;
 		}
 
-		/* Any other type of termination (signals, etc.) should also restart. */
+		/* Any other exit code, or no exit code, means we should restart. */
 		else {
-			CtdlLogPrintf(CTDL_DEBUG, " NON-EXIT TERMINATION \n");
 			do_restart = 1;
 			nFireUps++;
 			ForkedPid = current_child;
-- 
2.39.2