X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=7933bab7c3394b60f07746fdec199e143dc2ed57;hb=e3e7914fe2f59765e5f92371329652a02518928c;hp=a48c2230a02cb7b62744b57b329eeb396a60f1c5;hpb=450583abb79d5fedb0debabed073d9b191dac80c;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index a48c223..7933bab 100644
--- a/server/main.c
+++ b/server/main.c
@@ -33,6 +33,10 @@ void ParseArguments(int argc, char ** argv)
 
 	g_options.program = argv[0]; // program name
 	g_options.verbosity = LOGDEBUG; // default log level
+	// Set the main directory
+	if (getcwd(g_options.root_dir, sizeof(g_options.root_dir)) == NULL)
+		Fatal("Couldn't get current working directory - %s", strerror(errno));
+
 	gettimeofday(&(g_options.start_time), NULL); // Start time
 
 
@@ -85,6 +89,7 @@ void ParseArguments(int argc, char ** argv)
 	Log(LOGDEBUG, "Pin Module Enabled: %d", g_options.enable_pin);
 	Log(LOGDEBUG, "Auth URI: %s", g_options.auth_uri);
 	Log(LOGDEBUG, "LDAP Base DN: %s", g_options.ldap_base_dn);
+	Log(LOGDEBUG, "Root directory: %s", g_options.root_dir);
 
 	if (g_options.auth_uri[0] != '\0')
 	{
@@ -128,19 +133,19 @@ int main(int argc, char ** argv)
 	Pin_Init();
 	
 	// Try and start things
-	
+	/*
 	const char *ret;
 	if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
 		Fatal("Control_SetMode failed with '%s'", ret);
-	
+	*/
 
 	// run request thread in the main thread
 	FCGI_RequestLoop(NULL);
 
-	
+	/*
 	if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
 		Fatal("Control_SetMode failed with '%s'", ret);
-	
+	*/
 	//Sensor_StopAll();
 	//Actuator_StopAll();