--- lbbs/src/init.c	2005/05/07 12:08:28	1.10
+++ lbbs/src/init.c	2025/05/04 14:54:55	1.15
@@ -1,9 +1,9 @@
 /***************************************************************************
-                          init.c  -  description
-                             -------------------
-    begin                : Mon Oct 18 2004
-    copyright            : (C) 2004 by Leaflet
-    email                : leaflet@leafok.com
+						  init.c  -  description
+							 -------------------
+	begin                : Mon Oct 18 2004
+	copyright            : (C) 2004 by Leaflet
+	email                : leaflet@leafok.com
  ***************************************************************************/
 
 /***************************************************************************
@@ -15,114 +15,134 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "init.h"
+#include "database.h"
 #include "bbs.h"
 #include "common.h"
+#include "log.h"
 #include "io.h"
+#include <string.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-void
-init_daemon (void)
+void init_daemon(void)
 {
-  int pid;
-  int i;
+	int pid;
 
-  if (pid = fork ())
-    exit (0);
-  else if (pid < 0)
-    exit (1);
+	pid = fork();
 
-  setsid ();
-
-  if (pid = fork ())
-    exit (0);
-  else if (pid < 0)
-    exit (1);
-
-  umask (0);
-
-  return;
-}
-
-int
-load_conf (const char *conf_file)
-{
-  char temp[256];
-
-  // Load configuration
-  char c_name[256];
-  FILE *fin;
-
-  if ((fin = fopen (conf_file, "r")) == NULL)
-    {
-      log_error ("Open %s failed", conf_file);
-      return -1;
-    }
-
-  while (fscanf (fin, "%s", c_name) != EOF)
-    {
-      if (c_name[0] == '#')
+	if (pid > 0) // Parent process
 	{
-	  fgets (temp, 256, fin);
-	  continue;
+		exit(0);
 	}
-      fscanf (fin, "%*c");
-      if (strcmp (c_name, "bbs_id") == 0)
+	else if (pid < 0) // Error
 	{
-	  fscanf (fin, "%s", BBS_id);
+		exit(1);
 	}
-      if (strcmp (c_name, "bbs_name") == 0)
-	{
-	  fscanf (fin, "%s", BBS_name);
-	}
-      if (strcmp (c_name, "bbs_server") == 0)
-	{
-	  fscanf (fin, "%s", BBS_server);
-	}
-      if (strcmp (c_name, "bbs_address") == 0)
-	{
-	  fscanf (fin, "%s", BBS_address);
-	}
-      if (strcmp (c_name, "bbs_port") == 0)
-	{
-	  fscanf (fin, "%ud", &BBS_port);
-	}
-      if (strcmp (c_name, "bbs_max_client") == 0)
-	{
-	  fscanf (fin, "%d", &BBS_max_client);
-	}
-      if (strcmp (c_name, "bbs_max_user") == 0)
-	{
-	  fscanf (fin, "%d", &BBS_max_user);
-	}
-      if (strcmp (c_name, "bbs_start_dt") == 0)
-	{
-	  int y = 0, m = 0, d = 0;
-	  fscanf (fin, "%d-%d-%d", &y, &m, &d);
-	  sprintf (BBS_start_dt, "%4d年%2d月%2d日", y, m, d);
-	}
-      if (strcmp (c_name, "db_host") == 0)
-	{
-	  fscanf (fin, "%s", DB_host);
-	}
-      if (strcmp (c_name, "db_username") == 0)
+
+	// Child process
+	setsid();
+
+	pid = fork();
+
+	if (pid > 0) // Parent process
 	{
-	  fscanf (fin, "%s", DB_username);
+		exit(0);
 	}
-      if (strcmp (c_name, "db_password") == 0)
+	else if (pid < 0) // Error
 	{
-	  fscanf (fin, "%s", DB_password);
+		exit(1);
 	}
-      if (strcmp (c_name, "db_database") == 0)
-	{
-	  fscanf (fin, "%s", DB_database);
+
+	// Child process
+	umask(022);
+
+	return;
+}
+
+int load_conf(const char *conf_file)
+{
+	char temp[256];
+
+	// Load configuration
+	char c_name[256];
+	FILE *fin;
+
+	if ((fin = fopen(conf_file, "r")) == NULL)
+	{
+		log_error("Open %s failed", conf_file);
+		return -1;
+	}
+
+	while (fscanf(fin, "%s", c_name) != EOF)
+	{
+		if (c_name[0] == '#')
+		{
+			fgets(temp, 256, fin);
+			continue;
+		}
+		fscanf(fin, "%*c");
+		if (strcmp(c_name, "bbs_id") == 0)
+		{
+			fscanf(fin, "%s", BBS_id);
+		}
+		if (strcmp(c_name, "bbs_name") == 0)
+		{
+			fscanf(fin, "%s", BBS_name);
+		}
+		if (strcmp(c_name, "bbs_server") == 0)
+		{
+			fscanf(fin, "%s", BBS_server);
+		}
+		if (strcmp(c_name, "bbs_address") == 0)
+		{
+			fscanf(fin, "%s", BBS_address);
+		}
+		if (strcmp(c_name, "bbs_port") == 0)
+		{
+			fscanf(fin, "%ud", &BBS_port);
+		}
+		if (strcmp(c_name, "bbs_max_client") == 0)
+		{
+			fscanf(fin, "%d", &BBS_max_client);
+		}
+		if (strcmp(c_name, "bbs_max_user") == 0)
+		{
+			fscanf(fin, "%d", &BBS_max_user);
+		}
+		if (strcmp(c_name, "bbs_start_dt") == 0)
+		{
+			int y = 0, m = 0, d = 0;
+			fscanf(fin, "%d-%d-%d", &y, &m, &d);
+			sprintf(BBS_start_dt, "%4d年%2d月%2d日", y, m, d);
+		}
+		if (strcmp(c_name, "db_host") == 0)
+		{
+			fscanf(fin, "%s", DB_host);
+		}
+		if (strcmp(c_name, "db_username") == 0)
+		{
+			fscanf(fin, "%s", DB_username);
+		}
+		if (strcmp(c_name, "db_password") == 0)
+		{
+			fscanf(fin, "%s", DB_password);
+		}
+		if (strcmp(c_name, "db_database") == 0)
+		{
+			fscanf(fin, "%s", DB_database);
+		}
+		if (strcmp(c_name, "db_timezone") == 0)
+		{
+			fscanf(fin, "%s", DB_timezone);
+		}
 	}
-    }
 
-  fclose (fin);
+	fclose(fin);
 
-  return 0;
+	return 0;
 }