From 84b8189c13d371d63e19cbbe3b6a3838c3db70f9 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 9 Mar 2005 14:45:41 +0000
Subject: [PATCH] (daemon, daemonize): Rename to avoid name clash with BSD's
 daemon().

(daemonize): Supply missing declaration.
---
 include/misc.h               |  1 +
 src/lib/empthread/ntthread.c |  2 +-
 src/server/main.c            | 17 +++++++----------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/include/misc.h b/include/misc.h
index 5086be35..5f350ae0 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -124,6 +124,7 @@ typedef short coord;
 #define days(x)		(60*60*24*(x))
 
 extern int debug;
+extern int daemonize;
 
 /*
  * If EXPR is true, an internal error occured.
diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c
index 7ce861b6..c27a6b64 100644
--- a/src/lib/empthread/ntthread.c
+++ b/src/lib/empthread/ntthread.c
@@ -471,7 +471,7 @@ empth_exit(void)
     if (pThread->bMainThread) {
 	/* The main line.  Wait forever. */
 	while (1) {
-	    if (daemon) {
+	    if (daemonize) {
 		if (service_stopped())
 		    shutdwn(0);
 		Sleep(3);
diff --git a/src/server/main.c b/src/server/main.c
index 2587c0af..1e6bc705 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -76,13 +76,10 @@ static void loc_NTInit(void);
 
 static int mainpid = 0;
 
-/*
- * Debugging?
- * If yes, don't fork into background, don't catch certain signals,
- * call abort() on internal error.
- */
+/* Debugging?  If yes call abort() on internal error.  */
 int debug = 0;
-int daemon = 1;
+/* Run as daemon?  If yes, detach from controlling terminal etc. */
+int daemonize = 1;
 
 static void
 print_usage(char *program_name)
@@ -129,7 +126,7 @@ main(int argc, char **argv)
 	    break;
 	case 'd':
 	    debug++;
-	    daemon = 0;
+	    daemonize = 0;
 	    break;
 	case 'e':
 	    config_file = optarg;
@@ -204,7 +201,7 @@ main(int argc, char **argv)
 #endif	/* _WIN32 */
 
 #if defined(_WIN32)
-    if (daemon != 0) {
+    if (daemonize != 0) {
 	SERVICE_TABLE_ENTRY DispatchTable[]={{"Empire Server", service_main},{NULL, NULL}};
 	if (StartServiceCtrlDispatcher(DispatchTable))
 	    return 0;
@@ -220,12 +217,12 @@ main(int argc, char **argv)
 	    }
 	}
     }
-    daemon = 0;
+    daemonize = 0;
 #endif	/* _WIN32 */
 
     init_server(flags);
 #ifndef _WIN32
-    if (daemon != 0 && flags == 0)
+    if (daemonize != 0 && flags == 0)
 	disassoc();
 #endif
     start_server(flags);