--- lbbs/src/main.c	2004/10/21 17:28:46	1.6
+++ lbbs/src/main.c	2005/03/19 08:23:05	1.10
@@ -17,11 +17,14 @@
 
 #include "bbs.h"
 #include "common.h"
+#include "io.h"
+#include "menu.h"
+#include <string.h>
 
 void
 app_help(void)
 {
-  printf (
+  prints (
     "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"
@@ -35,7 +38,7 @@ app_help(void)
 void
 arg_error(void)
 {
-  printf ("Invalid arguments\n");
+  prints ("Invalid arguments\n");
   app_help();
 }
 
@@ -75,26 +78,26 @@ main (int argc, char *argv[])
         }
         else
         {
-   	  if (strcmp(argv[i]+2, "foreground") == 0)
+   	  if (strcmp (argv[i]+2, "foreground") == 0)
    	  {
       	      daemon = 0;
       	      break;
    	  }
-   	  if (strcmp(argv[i]+2, "help") == 0)
+   	  if (strcmp (argv[i]+2, "help") == 0)
    	  {
    	    app_help();
    	    exit(0);
    	  }
-   	  if (strcmp(argv[i]+2, "version") == 0)
+   	  if (strcmp (argv[i]+2, "version") == 0)
    	  {
    	    puts (app_version);
    	    exit(0);
    	  }
-   	  if (strcmp(argv[i]+2, "display-log") == 0)
+   	  if (strcmp (argv[i]+2, "display-log") == 0)
    	  {
    	    std_log_redir = 1;
    	  }
-   	  if (strcmp(argv[i]+2, "display-error-log") == 0)
+   	  if (strcmp (argv[i]+2, "display-error-log") == 0)
    	  {
    	    error_log_redir = 1;
    	  }
@@ -108,15 +111,18 @@ main (int argc, char *argv[])
     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");
-  mkdir(log_dir,0700);
-  if (log_begin(file_log_std,file_log_error)<0)
+  strncpy (app_home_dir, argv[0], rindex(argv[0],'/')-argv[0]+1);
+  strcat (app_home_dir, "../");
+  strcpy (app_temp_dir, "/tmp/lbbs/");
+  mkdir (app_temp_dir, 0700);
+  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);
+  if (log_begin (file_log_std, file_log_error)<0)
     exit(-1);
   if ((!daemon) && std_log_redir)
     log_std_redirect(2);
@@ -124,13 +130,19 @@ main (int argc, char *argv[])
     log_err_redirect(3);
 
   //Load configuration
-  strcpy(file_config, app_home_dir);
-  strcat(file_config, "conf/bbsd.conf");
+  strcpy (file_config, app_home_dir);
+  strcat (file_config, "conf/bbsd.conf");
   if (load_conf(file_config)<0)
     exit(-2);
 
+  //Load menus
+  strcpy (file_config, app_home_dir);
+  strcat (file_config, "conf/menu.conf");
+  if (load_menu (&bbs_menu, file_config)<0)
+    exit(-3);
+
   //Initialize socket server
-  net_server(BBS_address, BBS_port);
+  net_server (BBS_address, BBS_port);
 
   return 0;
 }