Changeset 4642 for trunk/gsdl/src/w32server/settings.cpp

Timestamp:

2003-06-13T12:24:12+12:00 (21 years ago)

Author:

sjboddie

Message:

Added command line arguments to server.exe so the GLI can tell it to use
an alternative config file.

File:

• trunk/gsdl/src/w32server/settings.cpp (modified) (5 diffs)

trunk/gsdl/src/w32server/settings.cpp

@@ -27 +27 @@
 
 #include "text_t.h"
+#include "fileutil.h"
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -63 +64 @@
 char gsdl_browser_exe[MAX_FILENAME_SIZE] = "";
 text_t gsdl_url;
+text_t gsdl_conffile;
 int gsdl_start_browser = 1;
 
@@ -269 +271 @@
 
 void write_settings (const text_t url) {
-  char conffile[MAX_FILENAME_SIZE];
-  
-  strcpy (conffile, data_location);
-  remove_end_slashes (conffile);
-  strcat (conffile, "\\gsdlsite.cfg");
-  
-  ofstream fout (conffile);
+  
+  if (gsdl_conffile.empty()) {
+    find_location();
+    gsdl_conffile = filename_cat(data_location, "gsdlsite.cfg");
+  }
+
+  char *conffile_c = gsdl_conffile.getcstr();
+  ofstream fout (conffile_c);
+  delete conffile_c;
   if (fout) {
     
@@ -397 +401 @@
 
 void read_settings (int netscapeneeded) {
-  char conffile[MAX_FILENAME_SIZE];
-  
-  find_location();
-  
-  strcpy (conffile, data_location);
-  remove_end_slashes (conffile);
-  strcat (conffile, "\\gsdlsite.cfg");
+  
+  if (gsdl_conffile.empty()) {
+    find_location();
+    gsdl_conffile = filename_cat(data_location, "gsdlsite.cfg");
+  }
   
   // set up defaults
@@ -410 +412 @@
   text_t key, value, section;
   char *cstr_value;
+  char *conffile_c = gsdl_conffile.getcstr();
 #if defined (GSDL_USE_IOS_H)
-  ifstream conf (conffile, ios::nocreate);
+  ifstream conf (conffile_c, ios::nocreate);
 #else
-  ifstream conf (conffile);
+  ifstream conf (conffile_c);
 #endif
+  delete conffile_c;
   if (conf) {
     while (read_ini_line(conf, key, value) >= 0) {