Made it so missing directives are found on a config file load.

[irc/gameservirc.git] / gameserv / tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 12e86cc430c0f954f22abdfd9e30b595e26b5385..1c00bbddf2e08680a8b610a6e430af00e8a48712 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -39,12 +39,13 @@ char *PACKAGE = "GameServ";
 char *VERSION = "1.1.8";
 
 int sock;
-long timestamp;
+int day;
 
 List<aClient> clients;
 
-void save_timestamp();
-void load_timestamp();
+void save_day();
+void load_day();
+void prettyIntro();
 
 // Make this a daemon
 int daemon(int nochdir, int noclose);
@@ -52,15 +53,35 @@ int daemon(int nochdir, int noclose);
 // Close all file descriptors from >= fd
 void closeall(int fd);
 
-int main()
+int main(int argc, char *argv[])
 {
   char buffer[1024], buf[1024];
   int connected = 1;
-  char *cmd, *source = NULL;
+  char *cmd, *source = NULL, *conf = "gameserv.conf";
   srand(time(NULL));
-  
 
-  load_config_file();          // default = gameserv.conf
+  if (argc > 1)
+  {
+       if ( argc > 2 || stricmp(argv[1], "--help") == 0)
+       {
+           cout << "Usage: gameserv [options] [configfile]" << endl;
+           cout << "Options:" << endl;
+           cout << "--help                        Displays this help dialogue" << endl;
+           return 1;
+       }
+       conf = new char[strlen(argv[1])];
+       strcpy(conf, argv[1]);
+  }
+
+  prettyIntro();
+
+  if (load_config_file(conf))
+  {
+       cout << "Config file loaded ok...\n"
+             << "Turning into a daemon" << endl;
+  }
+  else
+       exit(2);
 
     // Turn into a daemon
     if (daemon(1,0) < 0)
@@ -127,7 +148,7 @@ int main()
 
   init_masters();
   load_gs_dbase();
-  load_timestamp();
+  load_day();
   long int loadtime = time(NULL);
   long int currentTime;
   long int oldTime = loadtime;
@@ -351,7 +372,7 @@ int main()
   end:
 
   save_gs_dbase();
-  save_timestamp();
+  save_day();
 
   delete_monsters();
   delete_masters();
@@ -481,55 +502,56 @@ aClient *findbynick(const char *nick)
     return client;    
 }
 
-void load_timestamp()
+void load_day()
 {
     ifstream infile;
 
-    infile.open(".gstimestamp");
+    infile.open(".gsday");
 
     if (infile.fail())
     {
        #ifdef DEBUGMODE
-           log("Error opening .gstimestamp");
+           log("Error opening .gsday");
        #endif
 
        generate:
         #ifdef DEBUGMODE
-           log("Generating new timestamp");
+           log("Generating new day");
        #endif
-       timestamp = midnight();
-        save_timestamp();
+       struct tm *tm;
+       time_t ti;
+       time(&ti);
+       tm = localtime(&ti);
+
+       day = tm->tm_mday;
+
+        save_day();
        return;
     }
 
-    infile >> timestamp;
+    infile >> day;
     infile.close();
-    if (timestamp < 1000000)
+    if (day < 1 || day > 31)
        goto generate;
 }
 
-void save_timestamp()
+void save_day()
 {
     ofstream outfile;
 
-    outfile.open(".gstimestamp");
+    outfile.open(".gsday");
 
     if (outfile.fail())
     {
-       log("Error creating new file .gstimestamp");
+       log("Error creating new file .gsday");
        return;
     }
 
-    outfile << timestamp << endl;
+    outfile << day << endl;
 
     outfile.close();
 }
 
-long int midnight(long int offset)
-{
-    return (time(NULL) - (time(NULL) % 86400)) + (offset * 3600);
-}
-
 /* daemon() - detach process from user and disappear into the background
  * returns -1 on failure, but you can't do much except exit in that case
  * since we may already have forked. This is based on the BSD version,
@@ -593,4 +615,14 @@ void closeall(int fd)
       close(fd++);
 }
 
-
+void prettyIntro()
+{
+cout << endl;
+cout << "  GGGG     AAA   MM    MM EEEEEEE  SSSSS  EEEEEEE RRRRRR  VV     VV " << endl;
+cout << " GG  GG   AAAAA  MMM  MMM EE      SS      EE      RR   RR VV     VV " << endl;
+cout << "GG       AA   AA MM MM MM EEEEE    SSSSS  EEEEE   RRRRRR   VV   VV  " << endl;
+cout << "GG   GGG AAAAAAA MM    MM EE           SS EE      RR  RR    VV VV   " << endl;
+cout << "G     G  AA   AA MM    MM EEEEEEE  SSSSS  EEEEEEE RR   RR    VVV" << endl;
+cout << " GGGGG                                                        V\n\n" << endl;
+cout << "Version: " << VERSION << endl;
+}