* bin/bbackupd/Win32ServiceFunctions.h

* bin/bbackupd/Win32ServiceFunctions.cpp
- InstallService() and OurService() take the config file name as a
  parameter
- InstallService() returns an integer status code like RemoveService()
- OurService() sets the global static config file name to pass into
  the main thread later

* bin/bbackupd/bbackupd.cpp
- Call InstallService() and OurService() with the config file name as a
  parameter

3 files changed, 35 insertions, 12 deletions

diff --git a/bin/bbackupd/Win32ServiceFunctions.cpp b/bin/bbackupd/Win32ServiceFunctions.cpp
index ca8bc1ca..4a54fd1c 100644
--- a/bin/bbackupd/Win32ServiceFunctions.cpp
+++ b/bin/bbackupd/Win32ServiceFunctions.cpp
@@ -161,8 +161,10 @@ VOID ServiceMain(DWORD argc, LPTSTR *argv)
 	}
 }
 
-void OurService(void)
+void OurService(char* pConfigFileName)
 {
+	spConfigFileName = pConfigFileName;
+
 	SERVICE_TABLE_ENTRY serviceTable[] = 
 	{ 
 		{ SERVICE_NAME, (LPSERVICE_MAIN_FUNCTION) ServiceMain },
@@ -181,7 +183,7 @@ void OurService(void)
 	}
 }
 
-void InstallService(void)
+int InstallService(const char* pConfigFileName)
 {
 	SC_HANDLE newService, scm;
 
@@ -191,7 +193,7 @@ void InstallService(void)
 	{
 		syslog(LOG_ERR, "Failed to open service control manager: "
 			"error %d", GetLastError());
-		return;
+		return 1;
 	}
 
 	char cmd[MAX_PATH];
@@ -217,7 +219,7 @@ void InstallService(void)
 	{
 		::syslog(LOG_ERR, "Failed to create Box Backup service: "
 			"error %d", GetLastError());
-		return;
+		return 1;
 	}
 
 	::syslog(LOG_INFO, "Created Box Backup service");
@@ -234,6 +236,8 @@ void InstallService(void)
 
 	CloseServiceHandle(newService);
 	CloseServiceHandle(scm);
+
+	return 0;
 }
 
 int RemoveService(void)
diff --git a/bin/bbackupd/Win32ServiceFunctions.h b/bin/bbackupd/Win32ServiceFunctions.h
index 39f3a4e3..70e1f085 100644
--- a/bin/bbackupd/Win32ServiceFunctions.h
+++ b/bin/bbackupd/Win32ServiceFunctions.h
@@ -12,8 +12,8 @@
 #ifndef WIN32SERVICEFUNCTIONS_H
 #define WIN32SERVICEFUNCTIONS_H
 
-int  RemoveService(void);
-void InstallService(void);
-void OurService(void);
+int  RemoveService  (void);
+int  InstallService (const char* pConfigFilePath);
+void OurService     (char* pConfigFileName);
 
 #endif
diff --git a/bin/bbackupd/bbackupd.cpp b/bin/bbackupd/bbackupd.cpp
index 089b2d09..d2279074 100644
--- a/bin/bbackupd/bbackupd.cpp
+++ b/bin/bbackupd/bbackupd.cpp
@@ -43,14 +43,19 @@ int main(int argc, const char *argv[])
 		RemoveService();
 		return 0;
 	}
-	if(argc == 2 && ::strcmp(argv[1], "-i") == 0)
+	if((argc == 2 || argc == 3) && ::strcmp(argv[1], "-i") == 0)
 	{
-		InstallService();
+		const char* config = NULL;
+		if (argc == 3)
+		{
+			config = argv[2];
+		}
+		InstallService(config);
 		return 0;
 	}
 
 	bool runAsWin32Service = false;
-	if (argc == 2 && ::strcmp(argv[1], "--service") == 0)
+	if (argc >= 2 && ::strcmp(argv[1], "--service") == 0)
 	{
 		runAsWin32Service = true;
 	}
@@ -73,8 +78,22 @@ int main(int argc, const char *argv[])
 
 	if (runAsWin32Service)
 	{
-		syslog(LOG_INFO,"Starting Box Backup Service");
-		OurService();
+		syslog(LOG_INFO, "Box Backup service starting");
+
+		char* config = NULL;
+		if (argc >= 3)
+		{
+			config = strdup(argv[2]);
+		}
+
+		OurService(config);
+
+		if (config)
+		{
+			free(config);
+		}
+
+		syslog(LOG_INFO, "Box Backup service shut down");
 	}
 	else
 	{