1 files changed, 55 insertions, 130 deletions

diff --git a/src/main.cpp b/src/main.cpp
index c4330d8..2bfe28c 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,8 @@
 /*
- * yChat++; Contact: www.yChat.org; Mail@yChat.org
+ * yChat; Contact: www.yChat.org; Mail@yChat.org
  * Copyright (C) 2003 Paul C. Buetow, Volker Richter 
  * Copyright (C) 2004 Paul C. Buetow
+ * Copyright (C) 2005 EXA Digital Solutions GbR
  * -----------------------------------------------------------------
  *
  * This program is free software; you can redistribute it and/or
@@ -20,163 +21,87 @@
  *
  */
 
-#include <unistd.h>
-#include <signal.h>
 #include "incl.h"
+#include "sign.h"
 
-#ifndef NCURSES
-#ifdef CLI
-#include "cli/cli.h"
-#endif
-#endif
+
+#include "maps/hashmap.h"
 
 using namespace std;
 
 map<string,string>*
 parse_argc( int argc, char* argv[] )
 {
- map<string,string>* start_params = new map<string,string>;
-
- string s_output = "";
+  map<string,string>* start_params = new map<string,string>;
 
- // Set to 1 if a config option key has to be read ( ./ychat -o key1 value1 -o key2 value2 ... );
- bool b_conf = 0;
+  string s_output = "";
 
- // Will store the key of an additional option value (see also b_conf)
- string s_key;
+  // Set to 1 if a config option key has to be read
+  // ( ./ychat -o key1 value1 -o key2 value2 ... );
+  bool b_conf = 0;
 
- for (int i=1; argv[i] != 0; i++)
- {
+  // Will store the key of an additional option value (see also b_conf)
+  string s_key;
 
-  if ( !s_key.empty() )
+  for (int i=1; argv[i] != 0; i++)
   {
-   (*start_params)[s_key] = string(argv[i]);
-   s_key.clear();
-  }
-  else if ( b_conf )
-  {
-   s_key = string(argv[i]);
-   b_conf = 0;
+    if ( !s_key.empty() )
+    {
+      (*start_params)[s_key] = string(argv[i]);
+      s_key.clear();
+    }
+    else if ( b_conf )
+    {
+      s_key = string(argv[i]);
+      b_conf = 0;
+    }
+    else
+    {
+      if ( string(argv[i]).find("v") != string::npos )
+        s_output.append(tool::ychat_version()+"\n");
+
+      if ( string(argv[i]).find("h") != string::npos )
+        s_output.append( YCUSAGE );
+
+      if ( string(argv[i]).find("o") != string::npos )
+        b_conf = 1;
+    }
   }
 
-  else
+  if ( !s_output.empty() )
   {
-   if ( string(argv[i]).find("v") != string::npos )
-    s_output.append(tool::ychat_version()+"\n");
-   if ( string(argv[i]).find("h") != string::npos )
-    s_output.append( "Usage: ./ychat {h|v}|{o confkey confvalue}\n" );
-   if ( string(argv[i]).find("o") != string::npos )
-    b_conf = 1;
+    cout << s_output;
+    delete start_params;
+    exit(1);
   }
- }
 
- if ( s_output.compare("") != 0 )
- {
-  cout << s_output;
-  delete start_params;
-  exit(0);
- }
-
- return start_params;
+  return start_params;
 }
 
 int
 main(int argc, char* argv[])
 {
- map<string,string>* p_start_params = parse_argc( argc, argv );
-
-    cout << tool::ychat_version() << endl 
-         << DESCRIP << endl
-    	 << DESCRI2 << endl
-         << CONTACT << endl
-         << SEPERAT << endl;
-
-    // ignore SIGPIPE. otherwise the server will shut down with "Broken pipe" if
-    // a client unexpected disconnects himself from a SOCK_STREAM.
-    signal( SIGPIPE, SIG_IGN );
-
-    // all the static data classes have to be initialized once. otherwise they will
-    // contain only empty pointers and the chat server won't work correctly.
-    // the order of the initializations is very importand. for example the s_html::init()
-    // invokations assumes an initialized s_conf class.
-    // begin to draw the ncurses amdin interface in a new pthread.
-
-    // init the dynamic wrapper (is needed to pass all wrapped objects through a single pointer).
-    wrap::WRAP = new dynamic_wrap;
-
-    // init the config manager.
-    wrap::WRAP->CONF = wrap::CONF = new conf( CONFILE, p_start_params ); 
-    delete p_start_params,
-
-
-   // init the statistic manager.
-    wrap::WRAP->STAT = wrap::STAT = new stats; 
-
-    // init the html-template manager.
-    wrap::WRAP->HTML = wrap::HTML = new html; 
+  cout << tool::ychat_version() << endl
+  << DESCRIP << endl
+  << DESCRI2 << endl
+  << CONTACT << endl
+  << SEPERAT << endl;
 
-    // init the system message logd 
-    wrap::WRAP->LOGD = wrap::LOGD = new logd( wrap::CONF->get_elem("httpd.logging.systemfile"),
-                                              wrap::CONF->get_elem("httpd.logging.systemlines") );
-    //<<*
-    // init the session manager.
-    wrap::WRAP->SMAN = wrap::SMAN = new sman; 
-    //*>>
-    
-
-    // init the socket manager.
-    wrap::WRAP->SOCK = wrap::SOCK = new sock; 
-
-#ifdef NCURSES
-    wrap::WRAP->NCUR = wrap::NCUR = new ncur; 	// init the ncurses admin interface.
-    wrap::NCUR->run();				// run the thread
-
-    // wait until ncurses interface has been initialized.
-    while ( ! wrap::NCUR->is_ready() )
-     usleep(1000);
-#endif
-
-    //<<*
-    // init the chat manager.
-    wrap::WRAP->CHAT = wrap::CHAT = new chat; 
-    //*>>
-
-    // init the system timer.
-    wrap::WRAP->TIMR = wrap::TIMR = new timr; 
-    wrap::TIMR->run(); // run the thread
-
-    // init the module-loader manager.
-    wrap::WRAP->MODL = wrap::MODL = new modl; 
-
-    //<<*
-    // init the garbage collector 
-    wrap::WRAP->GCOL = wrap::GCOL = new gcol; 
-
-    // init the data manager. 
-#ifdef DATABASE
-    wrap::WRAP->DATA = wrap::DATA = new data; 
-#endif
-    //*>>
-
-#ifndef NCURSES
-#ifdef CLI
-    cli* p_cli = new cli;
-    p_cli->run();
-#endif
-#endif
+  wrap::init_wrapper(parse_argc(argc, argv));
 
-    //<<*	
-    // Initialize database connection queue
+  //<<*
+  // Initialize database connection queue
 #ifdef DATABASE
-    wrap::DATA->initialize_connections();
+  wrap::DATA->init_connections();
 #endif
-    //*>>
+  //*>>
 
-    // start the socket manager. this one will listen for incoming http requests and will
-    // forward them to the specified routines which will generate a http response.
-    wrap::SOCK->start();
+  sign::init_signal_handlers();
 
-    cout << DOWNMSG << endl;
+  // start the socket manager. this one will listen for incoming http requests and will
+  // forward them to the specified routines which will generate a http response.
+  wrap::SOCK->start();
 
-    return 0;
+  cout << DOWNMSG << endl;
+  return 0;
 }