Changeset 4642

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.

Location:

trunk/gsdl/src/w32server

Files:

• fnord.cpp (modified) (3 diffs)
• locate.cpp (modified) (2 diffs)
• locate.h (modified) (2 diffs)
• settings.cpp (modified) (5 diffs)
• settings.h (modified) (1 diff)

trunk/gsdl/src/w32server/fnord.cpp

@@ -631 +631 @@
     
     find_location();
-    strcpy (winsockpath, data_location);
+    char *data_location_c = data_location.getcstr();
+    strcpy (winsockpath, data_location_c);
+    delete data_location_c;
     
     // remove all the slashes at the end of billpath
@@ -824 +826 @@
 }
 
+// possible command line options are 
+// --location=directory (the path to GSDLHOME which defaults to the
+// directory where server.exe lives)
+// --config=file (the path to the configuration file to use which defaults
+// to GSDLHOME\gsdlsite.cfg)
+static void parse_args(const text_t cmdline, text_t &location, text_t &config_file) {
+
+  location.clear();
+  config_file.clear();
+
+  if (cmdline.size() < 3) return;
+
+  text_t name, val;
+  bool foundname = false;
+  text_t::const_iterator here = cmdline.begin();
+  text_t::const_iterator end = cmdline.end();
+  while (here != end) {
+    if (*here == '-' && ((here+1) != end) && (*(here+1) == '-')) {
+      here++;
+      if (name == "location") {
+    location = val;
+      } else if (name == "config") {
+    config_file = val;
+      }
+      foundname = false;
+      name.clear();
+      val.clear();
+    } else if (*here == '=') {
+      foundname = true;
+    } else {
+      if (foundname) {
+    val.push_back(*here);
+      } else {
+    name.push_back(*here);
+      }
+    }
+    here++;
+  }
+  if (name == "location") {
+    location = val;
+  } else if (name == "config") {
+    config_file = val;
+  }
+}
+
 
 int __stdcall WinMain(HINSTANCE Instance, HINSTANCE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) {
   HWND MainWindow;  MSG Message;  WNDCLASS MainClass;  
-  
+
+  // parse arguments
+  text_t location, config_file;
+  parse_args(CmdLineStr, location, config_file);
+  gsdl_conffile = config_file;
+
   //Create a window class
   MainClass.style = CS_HREDRAW | CS_VREDRAW;
@@ -865 +917 @@
   
   ShowWindow(MainWindow, SW_SHOW); 
-  set_location(CmdLineStr);
+  set_location(location);
   
   // get ready to draw the main window

trunk/gsdl/src/w32server/locate.cpp

@@ -41 +41 @@
 
 static int location_found=0;
-char data_location[MAX_FILENAME_SIZE];
-
-void set_location(char *possible)
+text_t data_location;
+
+void set_location(text_t possible)
 {
   if (location_found != 0) return;
-  if (possible != NULL && *possible != 0) {
-    strcpy(data_location, possible);
-    if (data_location[strlen(data_location)-1] != '\\')
-      strcat(data_location,"\\");
+  if (!possible.empty()) {
+    data_location = possible;
+    if (*(data_location.end()-1) != '\\') {
+      data_location.push_back('\\');
+    }
     location_found = 1;
   }
@@ -56 +57 @@
 void find_location(void)
 {
+  if (location_found != 0) return;
+  
+  char here[MAX_FILENAME_SIZE];
   char *send;
-  if (location_found != 0) return;
-  if (GetModuleFileName(NULL,data_location,MAX_FILENAME_SIZE) <= 0)
-    send = data_location;
-  else {
-    send = strrchr(data_location,'\\');
-    if (send != NULL)
+
+  if (GetModuleFileName(NULL,here,MAX_FILENAME_SIZE) <= 0) {
+    // failed
+    data_location.clear();
+  } else {
+    send = strrchr(here,'\\');
+    if (send != NULL) {
       send++;
-    else {
-      send = strchr(data_location,':');
-      if (send != NULL)
+    } else {
+      send = strchr(here,':');
+      if (send != NULL) {
         send++;
-      else
-        send == data_location;
-      }
-    }
+      } else {
+        send = here;
+      }
+    }
+  }
   *send = 0;
+  data_location.setcstr(here);
   location_found = 1;
 }

trunk/gsdl/src/w32server/locate.h

@@ -30 +30 @@
 #endif
 
+#include "text_t.h"
+
 extern HWND GSDL_Window;
 extern int line_spacing;
@@ -36 +38 @@
 void refresh_console(HDC dc);
 
-extern char data_location[MAX_FILENAME_SIZE];
+extern text_t data_location;
 
-extern void set_location(char *possible);
+extern void set_location(text_t possible);
 extern void find_location(void);
 

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) {

trunk/gsdl/src/w32server/settings.h

@@ -58 +58 @@
 extern char gsdl_browser_exe[MAX_FILENAME_SIZE];
 extern text_t gsdl_url;
+extern text_t gsdl_conffile;
 extern int gsdl_start_browser;