--- lbbs/src/main.c	2004/10/18 11:34:15	1.3
+++ lbbs/src/main.c	2004/10/20 07:46:32	1.5
@@ -15,47 +15,37 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "bbs.h"
 #include "common.h"
 
-char app_home_dir[256];
-
 int
 main (int argc, char *argv[])
 {
-  char log_dir[256], file_log_std[256], file_log_error[256];
+  char log_dir[256], file_log_std[256], file_log_error[256], file_config[256];
   
   //Initialize daemon
   init_daemon ();
 
   //Initialize log
-  strncpy(app_home_dir,argv[0],rindex(argv[0],'/')-argv[0]+1);
-  strcpy(log_dir,app_home_dir);
-  strcat(log_dir,"log/");
-  strcpy(file_log_std,log_dir);
-  strcpy(file_log_error,log_dir);
-  strcat(file_log_std,"bbsd.log");
-  strcat(file_log_error,"error.log");
+  strncpy(app_home_dir, argv[0], rindex(argv[0],'/')-argv[0]+1);
+  strcpy(log_dir, app_home_dir);
+  strcat(log_dir, "log/");
+  strcpy(file_log_std, log_dir);
+  strcpy(file_log_error, log_dir);
+  strcat(file_log_std, "bbsd.log");
+  strcat(file_log_error, "error.log");
   mkdir(log_dir,0700);
-  log_begin(file_log_std,file_log_error);
+  if (log_begin(file_log_std,file_log_error)<0)
+    exit(-1);
 
-  //Initialize socket server
-  net_server("",2323);
+  //Load configuration
+  strcpy(file_config, app_home_dir);
+  strcat(file_config, "conf/bbsd.conf");
+  if (load_conf(file_config)<0)
+    exit(-2);
 
-/*
-  FILE *fp;
-  time_t t;
-
-  while (1)
-    {
-      sleep (60);
-      if ((fp = fopen ("bbsd.log", "a")) >= 0)
-	{
-	  t = time (0);
-	  fprintf (fp, "I'm here at %s\n", asctime (localtime (&t)));
-	  fclose (fp);
-	}
-    }
-*/
+  //Initialize socket server
+  net_server(BBS_address, BBS_port);
 
   return 0;
 }