--- lbbs/src/main.c	2004/10/18 11:34:15	1.3
+++ lbbs/src/main.c	2004/10/21 17:28:46	1.6
@@ -15,47 +15,122 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "bbs.h"
 #include "common.h"
 
-char app_home_dir[256];
+void
+app_help(void)
+{
+  printf (
+    "Usage: bbsd [-fhv] [...]\n\n"
+    "-f\t--foreground\t\tForce program run in foreground\n"
+    "-h\t--help\t\t\tDisplay this help message\n"
+    "-v\t--version\t\tDisplay version information\n"
+    "\t--display-log\t\tDisplay standard log information\n"
+    "\t--display-error-log\tDisplay error log information\n"
+    "\n    If meet any bug, please report to <leaflet@leafok.com>\n\n"
+  );
+}
+
+void
+arg_error(void)
+{
+  printf ("Invalid arguments\n");
+  app_help();
+}
 
 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];
+  int i,j;
+  int daemon = 1, std_log_redir = 0, error_log_redir = 0;
+
+  //Parse args
+  for (i=1; i<argc; i++)
+  {
+    switch (argv[i][0])
+    {
+      case '-':
+      	if (argv[i][1] != '-')
+      	{
+      	for (j=1; j<strlen(argv[i]); j++)
+      	{
+      	  switch (argv[i][j])
+      	  {
+      	    case 'f':
+      	      daemon = 0;
+      	      break;
+      	    case 'h':
+      	      app_help();
+      	      exit(0);
+      	    case 'v':
+      	      puts (app_version);
+      	      exit(0);
+      	    default:
+      	      arg_error();
+      	      exit(1);
+      	  }
+      	}
+        }
+        else
+        {
+   	  if (strcmp(argv[i]+2, "foreground") == 0)
+   	  {
+      	      daemon = 0;
+      	      break;
+   	  }
+   	  if (strcmp(argv[i]+2, "help") == 0)
+   	  {
+   	    app_help();
+   	    exit(0);
+   	  }
+   	  if (strcmp(argv[i]+2, "version") == 0)
+   	  {
+   	    puts (app_version);
+   	    exit(0);
+   	  }
+   	  if (strcmp(argv[i]+2, "display-log") == 0)
+   	  {
+   	    std_log_redir = 1;
+   	  }
+   	  if (strcmp(argv[i]+2, "display-error-log") == 0)
+   	  {
+   	    error_log_redir = 1;
+   	  }
+       	}
+      	break;
+    }
+  }
+      	    
   //Initialize daemon
-  init_daemon ();
+  if (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);
+  if ((!daemon) && std_log_redir)
+    log_std_redirect(2);
+  if ((!daemon) && error_log_redir)
+    log_err_redirect(3);
+
+  //Load configuration
+  strcpy(file_config, app_home_dir);
+  strcat(file_config, "conf/bbsd.conf");
+  if (load_conf(file_config)<0)
+    exit(-2);
 
   //Initialize socket server
-  net_server("",2323);
-
-/*
-  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);
-	}
-    }
-*/
+  net_server(BBS_address, BBS_port);
 
   return 0;
 }