Changeset 4642 for trunk/gsdl/src/w32server/fnord.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/fnord.cpp (modified) (3 diffs)

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