1 files changed, 81 insertions, 112 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 3470148..0948e63 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 /*
- * yChat; Contact: www.yChat.org; Mail@yChat.org
+ * yhttpd++; Contact: www.yhttpd.org; Mail@yhttpd.org
  * Copyright (C) 2003 Paul C. Buetow, Volker Richter 
- * Copyright (C) 2004, 2005 Paul C. Buetow
+ * Copyright (C) 2004 Paul C. Buetow
  * -----------------------------------------------------------------
  *
  * This program is free software; you can redistribute it and/or
@@ -30,161 +30,130 @@
 #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>;
+ map<string,string>* start_params = new map<string,string>;
+
+ string s_output = "";
 
-  string s_output = "";
+ // Set to 1 if a config option key has to be read ( ./yhttpd -o key1 value1 -o key2 value2 ... );
+ bool b_conf = 0;
 
-  // Set to 1 if a config option key has to be read
-  // ( ./ychat -o key1 value1 -o key2 value2 ... );
-  bool b_conf = 0;
+ // Will store the key of an additional option value (see also b_conf)
+ string s_key;
 
-  // Will store the key of an additional option value (see also b_conf)
-  string s_key;
+ for (int i=1; argv[i] != 0; i++)
+ {
 
-  for (int i=1; argv[i] != 0; i++)
+  if ( !s_key.empty() )
+  {
+   (*start_params)[s_key] = string(argv[i]);
+   s_key.clear();
+  }
+  else if ( b_conf )
   {
-    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;
-    }
+   s_key = string(argv[i]);
+   b_conf = 0;
   }
 
-  if ( !s_output.empty() )
+  else
   {
-    cout << s_output;
-    delete start_params;
-    exit(1);
+   if ( string(argv[i]).find("v") != string::npos )
+    s_output.append(tool::yhttpd_version()+"\n");
+   if ( string(argv[i]).find("h") != string::npos )
+    s_output.append( "Usage: ./yhttpd {h|v}|{o confkey confvalue}\n" );
+   if ( string(argv[i]).find("o") != string::npos )
+    b_conf = 1;
   }
+ }
 
-  return start_params;
+ if ( s_output.compare("") != 0 )
+ {
+  cout << s_output;
+  delete start_params;
+  exit(0);
+ }
+
+ return start_params;
 }
 
 int
 main(int argc, char* argv[])
 {
-  map<string,string>* p_start_params = parse_argc( argc, argv );
+ map<string,string>* p_start_params = parse_argc( argc, argv );
 
-  cout << tool::ychat_version() << endl
-  << DESCRIP << endl
-  << DESCRI2 << endl
-  << CONTACT << endl
-  << SEPERAT << endl;
+    cout << tool::yhttpd_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 );
+    // 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 conf class.
+    // 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 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 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;
+   // init the statistic manager.
+    wrap::WRAP->STAT = wrap::STAT = new stats; 
 
-#ifdef LOGGING
-  // 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") );
-#endif
-  //<<*
-  // Init the session manager.
-  wrap::WRAP->SMAN = wrap::SMAN = new sman;
-  //*>>
+    // init the html-template manager.
+    wrap::WRAP->HTML = wrap::HTML = new html; 
 
+    // 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 socket manager.
-  wrap::WRAP->SOCK = wrap::SOCK = new sock;
+    // 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
 
-  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);
-
-  wrap::HTML->print_cached(0);
+    // 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 system timer.
+    wrap::WRAP->TIMR = wrap::TIMR = new timr; 
+    wrap::TIMR->run(); // run the thread
 
-  // Init the data manager.
-#ifdef DATABASE
+    // init the module-loader manager.
+    wrap::WRAP->MODL = wrap::MODL = new modl; 
 
-  wrap::WRAP->DATA = wrap::DATA = new data;
-#endif
-  //*>>
 
 #ifndef NCURSES
 #ifdef CLI
-
-  cli* p_cli = new cli;
-  p_cli->run();
+    cli* p_cli = new cli;
+    p_cli->run();
 #endif
 #endif
 
-  //<<*
-  // Initialize database connection queue
-#ifdef DATABASE
 
-  wrap::DATA->initialize_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();
 
-  // 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();
+    cout << DOWNMSG << endl;
 
-  cout << DOWNMSG << endl;
-  return 0;
+    return 0;
 }