--- lbbs/src/log.c	2004/10/21 17:28:46	1.5
+++ lbbs/src/log.c	2005/05/07 12:08:28	1.10
@@ -15,7 +15,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "common.h"
+#include "io.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
 
 FILE *fp_log_std;
 FILE *fp_log_err;
@@ -52,80 +57,66 @@ log_head (char *buf)
 {
   time_t t;
   char s_time[256];
-  t = time(0);
-  
-  strftime(s_time,256,"%Y-%m-%d %H:%M:%S", localtime (&t));
-  sprintf(buf,"[%s] [%d] ", s_time, getpid());
-  
+  t = time (0);
+
+  strftime (s_time, 256, "%Y-%m-%d %H:%M:%S", localtime (&t));
+  sprintf (buf, "[%s] [%d] ", s_time, getpid ());
+
   return 0;
 }
 
 int
-log_std (char *msg)
+log_std (const char *format, ...)
 {
+  va_list args;
+  int retval;
   char buf[1024];
 
-  if (fp_log_std == NULL)
-    {
-      perror ("log_std failed\n");
-      return -1;
-    }
+  log_head (buf);
+  strcat (buf, format);
 
-  log_head(buf);
+  va_start (args, format);
+  retval = vfprintf (fp_log_std, buf, args);
+  va_end (args);
 
-  strcat(buf,msg);
-  
-  if (fprintf (fp_log_std, buf)<0)
-    {
-      perror ("log_std failed\n");
-      return -2;
-    }
+  fflush (fp_log_std);
 
-  fflush(fp_log_std);
-  
-  return 0;
+  return retval;
 }
 
 int
-log_error (char *error_msg)
+log_error (const char *format, ...)
 {
+  va_list args;
+  int retval;
   char buf[1024];
-  
-  if (fp_log_err == NULL)
-    {
-      perror ("log_error failed\n");
-      return -1;
-    }
 
-  log_head(buf);
+  log_head (buf);
+  strcat (buf, format);
 
-  strcat(buf,error_msg);
+  va_start (args, format);
+  retval = vfprintf (fp_log_err, buf, args);
+  va_end (args);
 
-  if (fprintf (fp_log_err, buf)<0)
-    {
-      perror ("log_error failed\n");
-      return -2;
-    }
-  
-  fflush(fp_log_err);
+  fflush (fp_log_err);
 
-  return 0;
+  return retval;
 }
 
 int
-log_std_redirect(int fd)
+log_std_redirect (int fd)
 {
   int ret;
-  close (fileno(fp_log_std));
-  ret =  dup2(fd, fileno(fp_log_std));
+  close (fileno (fp_log_std));
+  ret = dup2 (fd, fileno (fp_log_std));
   return ret;
 }
 
 int
-log_err_redirect(int fd)
+log_err_redirect (int fd)
 {
   int ret;
-  close (fileno(fp_log_err));
-  ret =  dup2(fd, fileno(fp_log_err));
+  close (fileno (fp_log_err));
+  ret = dup2 (fd, fileno (fp_log_err));
   return ret;
 }