Make Configuration take a std::string filename instead of a char array,

in C++ style.

Add a function to get default config file paths at runtime, dependent on
the location of the executable being run.

Pass the config file name directly to Daemon::Main, instead of faking argv.

No default raid file path at compile time on Windows, depends on
executable location when run.

Determine RaidFile path at runtime if not supplied in config file
on Windows.

Don't define default locations for config files at compile time on Windows,
provide macros to determine them at runtime instead.

Make FileHandleGuard take a std::string instead of a char array, C++ style.

Determine config file location at runtime instead of hard-coding on
Windows. Thanks to Paul MacKenzie, Per Thomsen, Pete Jalajas, Stuart
Sanders, Dave Bamford and Gary for pushing me to do this. (fixes #12)

Determine config file path at runtime. Call Daemon::Main with config file
name instead of building fake argv.

(refs #3, merges [1684] [1685] [1686] [1687] [1688] [1689] [1690]
[1691] [1692])

1 files changed, 1 insertions, 4 deletions

diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
index 696bd1a6..3942ea7c 100644
--- a/test/bbackupd/testbbackupd.cpp
+++ b/test/bbackupd/testbbackupd.cpp
@@ -612,10 +612,7 @@ int start_internal_daemon()
 	int own_pid = getpid();
 		
 	BackupDaemon daemon;
-	const char* fake_argv[] = { "bbackupd", "testfiles/bbackupd.conf" };
-	
-	int result = daemon.Main(BOX_FILE_BBACKUPD_DEFAULT_CONFIG, 2, 
-		fake_argv);
+	int result = daemon.Main("testfiles/bbackupd.conf");
 	
 	TEST_THAT(result == 0);
 	if (result != 0)