Changeset 1688

Timestamp:

26/05/2007 16:30:05 (20 months ago)

Author:

chris

Message:

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

Files:

• box/chris/general/lib/common/BoxPortsAndFiles.h (modified) (1 diff)

box/chris/general/lib/common/BoxPortsAndFiles.h

@@ -15 +15 @@
 
 // Backup store daemon
-#define BOX_PORT_BBSTORED                                       (BOX_PORT_BASE+1)
-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG        "/etc/box/bbstored.conf"
+#define BOX_PORT_BBSTORED                       (BOX_PORT_BASE+1)
+
 // directory within the RAIDFILE root for the backup store daemon
-#define BOX_RAIDFILE_ROOT_BBSTORED                      "backup"
+#define BOX_RAIDFILE_ROOT_BBSTORED              "backup"
 
-// Backup client daemon
+// configuration file paths
 #ifdef WIN32
-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG        "C:\\Program Files\\Box Backup\\bbackupd.conf"
+        // no default config file path, use these macros to call
+        // GetDefaultConfigFilePath() instead.
+
+        #define BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE \
+                GetDefaultConfigFilePath("bbackupd.conf").c_str()
+        #define BOX_GET_DEFAULT_RAIDFILE_CONFIG_FILE \
+                GetDefaultConfigFilePath("raidfile.conf").c_str()
+        #define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \
+                GetDefaultConfigFilePath("bbstored.conf").c_str()
 #else
 #define BOX_FILE_BBACKUPD_DEFAULT_CONFIG        "/etc/box/bbackupd.conf"
+#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG        "/etc/box/raidfile.conf"
+#define BOX_FILE_BBSTORED_DEFAULT_CONFIG        "/etc/box/bbstored.conf"
 #endif
-
-// RaidFile conf location default
-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG        "/etc/box/raidfile.conf"
 
 // Default name of the named pipe