From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 26 Aug 2010 17:34:24 +0000 (-0500)
Subject: FSCORE-652
X-Git-Tag: v1.2-rc1~455
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f26a69724292636f19aa651eb2569b41031ed726;p=thirdparty%2Ffreeswitch.git

FSCORE-652
---

diff --git a/src/switch.c b/src/switch.c
index a28baba6f0..9183121ab4 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -272,6 +272,7 @@ int main(int argc, char *argv[])
 	const char *err = NULL;		/* error value for return from freeswitch initialization */
 #ifndef WIN32
 	int nf = 0;					/* TRUE if we are running in nofork mode */
+	int bf = 0;
 	char *runas_user = NULL;
 	char *runas_group = NULL;
 #else
@@ -328,6 +329,7 @@ int main(int argc, char *argv[])
 		"\t-monotonic-clock       -- use monotonic clock as timer source\n"
 #else
 		"\t-nf                    -- no forking\n"
+		"\t-bf                    -- block until fully started, then fork\n"
 		"\t-u [user]              -- specify user to switch to\n" "\t-g [group]             -- specify group to switch to\n"
 #endif
 		"\t-help                  -- this message\n" "\t-version               -- print the version and exit\n"
@@ -461,6 +463,11 @@ int main(int argc, char *argv[])
 			known_opt++;
 		}
 
+		if (local_argv[x] && !strcmp(local_argv[x], "-bf")) {
+			bf++;
+			known_opt++;
+		}
+
 		if (local_argv[x] && !strcmp(local_argv[x], "-version")) {
 			fprintf(stdout, "FreeSWITCH version: %s\n", SWITCH_VERSION_FULL);
 			return 0;
@@ -523,8 +530,14 @@ int main(int argc, char *argv[])
 		}
 
 		if (local_argv[x] && !strcmp(local_argv[x], "-nc")) {
-			nc++;
-			known_opt++;
+			if (!nf) {
+				nc++;
+				known_opt++;
+			} else {
+				/* The flags -nc and -nf are mutually exclusive. Ignoring -nc. */
+				nc = 0;
+				known_opt++;
+			}
 		}
 
 		if (local_argv[x] && !strcmp(local_argv[x], "-c")) {
@@ -685,7 +698,7 @@ int main(int argc, char *argv[])
 #ifdef WIN32
 		FreeConsole();
 #else
-		if (!nf) {
+		if (!nf && !bf) {
 			daemonize();
 		}
 #endif
@@ -800,6 +813,10 @@ int main(int argc, char *argv[])
 		return 255;
 	}
 
+	if(bf) {
+		daemonize();
+	}
+
 	switch_core_runtime_loop(nc);
 
 	destroy_status = switch_core_destroy();