Replace trunk with chris/merge.

1 files changed, 3 insertions, 19 deletions

diff --git a/bin/bbackupd/Win32BackupService.cpp b/bin/bbackupd/Win32BackupService.cpp
index 7cbf4828..9f0ac867 100644
--- a/bin/bbackupd/Win32BackupService.cpp
+++ b/bin/bbackupd/Win32BackupService.cpp
@@ -29,33 +29,17 @@ void TerminateService(void)
 
 DWORD Win32BackupService::WinService(const char* pConfigFileName)
 {
-	char exepath[MAX_PATH];
-	GetModuleFileName(NULL, exepath, sizeof(exepath));
+	DWORD ret;
 
-	std::string configfile;
-	
 	if (pConfigFileName != NULL)
 	{
-		configfile = pConfigFileName;
+		ret = this->Main(pConfigFileName);
 	}
 	else
 	{
-		// make the default config file name,
-		// based on the program path
-		configfile = exepath;
-		configfile = configfile.substr(0,
-			configfile.rfind(DIRECTORY_SEPARATOR_ASCHAR));
-		configfile += DIRECTORY_SEPARATOR "bbackupd.conf";
+		ret = this->Main(BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE);
 	}
 
-	const char *argv[] = {exepath, "-c", configfile.c_str()};
-	int argc = sizeof(argv) / sizeof(*argv);
-	DWORD ret;
-
-	MAINHELPER_START
-	ret = this->Main(BOX_FILE_BBACKUPD_DEFAULT_CONFIG, argc, argv);
-	MAINHELPER_END
-
 	return ret;
 }