--- lbbs/src/log.c	2004/10/18 11:33:20	1.1
+++ lbbs/src/log.c	2025/05/05 11:18:45	1.14
@@ -1,9 +1,9 @@
 /***************************************************************************
-                          log.c  -  description
-                             -------------------
-    begin                : Mon Oct 18 2004
-    copyright            : (C) 2004 by leaf
-    email                : leaflet@leafok.com
+						  log.c  -  description
+							 -------------------
+	begin                : Mon Oct 18 2004
+	copyright            : (C) 2004 by leaf
+	email                : leaflet@leafok.com
  ***************************************************************************/
 
 /***************************************************************************
@@ -15,70 +15,102 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "common.h"
+#include "io.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
 
 FILE *fp_log_std;
 FILE *fp_log_err;
 
-int
-log_begin (char *file_log_std, char *file_log_err)
+int log_begin(char *file_log_std, char *file_log_err)
 {
-  fp_log_std = fopen (file_log_std, "a");
-  if (fp_log_std == NULL)
-    {
-      perror ("log_begin failed\n");
-      return -1;
-    }
+	fp_log_std = fopen(file_log_std, "a");
+	if (fp_log_std == NULL)
+	{
+		perror("log_begin failed\n");
+		return -1;
+	}
+
+	fp_log_err = fopen(file_log_err, "a");
+	if (fp_log_err == NULL)
+	{
+		perror("log_begin failed\n");
+		return -2;
+	}
 
-  fp_log_err = fopen (file_log_err, "a");
-  if (fp_log_err == NULL)
-    {
-      perror ("log_begin failed\n");
-      return -1;
-    }
+	return 0;
+}
 
-  return 0;
+void log_end()
+{
+	fclose(fp_log_std);
+	fclose(fp_log_err);
 }
 
-int
-log_end ()
+int log_head(char *buf)
 {
-  fclose (fp_log_std);
-  fclose (fp_log_err);
+	time_t t;
+	char s_time[256];
+	t = time(0);
+
+	strftime(s_time, sizeof(s_time), "%Y-%m-%d %H:%M:%S", localtime(&t));
+	sprintf(buf, "[%s] [%d] ", s_time, getpid());
+
+	return 0;
 }
 
-int
-log_std (char *msg)
+int log_std(const char *format, ...)
 {
-  if (fp_log_std == NULL)
-    {
-      perror ("log_std failed\n");
-      return -1;
-    }
+	va_list args;
+	int retval;
+	char buf[1024];
 
-  if (fprintf (fp_log_std, msg)<0)
-    {
-      perror ("log_std failed\n");
-      return -2;
-    }
+	log_head(buf);
+	strncat(buf, format, sizeof(buf) - strnlen(buf, sizeof(buf)));
 
-  return 0;
+	va_start(args, format);
+	retval = vfprintf(fp_log_std, buf, args);
+	va_end(args);
+
+	fflush(fp_log_std);
+
+	return retval;
 }
 
-int
-log_error (char *error_msg)
+int log_error(const char *format, ...)
 {
-  if (fp_log_err == NULL)
-    {
-      perror ("log_error failed\n");
-      return -1;
-    }
+	va_list args;
+	int retval;
+	char buf[1024];
+
+	log_head(buf);
+	strncat(buf, format, sizeof(buf) - strnlen(buf, sizeof(buf)));
 
-  if (fprintf (fp_log_err, error_msg)<0)
-    {
-      perror ("log_error failed\n");
-      return -2;
-    }
+	va_start(args, format);
+	retval = vfprintf(fp_log_err, buf, args);
+	va_end(args);
 
-  return 0;
+	fflush(fp_log_err);
+
+	return retval;
+}
+
+int log_std_redirect(int fd)
+{
+	int ret;
+	close(fileno(fp_log_std));
+	ret = dup2(fd, fileno(fp_log_std));
+	return ret;
+}
+
+int log_err_redirect(int fd)
+{
+	int ret;
+	close(fileno(fp_log_err));
+	ret = dup2(fd, fileno(fp_log_err));
+	return ret;
 }