X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flog.c;h=eb3c0ab26d4736034b906fca3d5dacc445f61649;hb=8ffdaed1c5f5bf4ad0914b8d17f14af51ce037a5;hp=f2440e803917303f6952c778eeee0bf061078302;hpb=6e419fae23837754aed6e043007cf5a7228607bb;p=libucw.git

diff --git a/lib/log.c b/lib/log.c
index f2440e80..eb3c0ab2 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -9,39 +9,71 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/time.h>
+#include <time.h>
 
-static byte *log_progname;
+static char *log_progname, log_name_patt[64], log_name[64];
 static pid_t log_pid;
+static int log_params;
 
 void
 log_fork(void)
 {
-  log_pid = 0;
+  log_pid = getpid();
 }
 
 static void
-vlog(unsigned int cat, byte *msg, va_list args)
+log_switch(struct tm *tm)
+{
+  int fd;
+  char name[64];
+
+  if (!log_name_patt[0] ||
+      log_name[0] && !log_params)
+    return;
+  strftime(name, sizeof(name), log_name_patt, tm);
+  if (!strcmp(name, log_name))
+    return;
+  strcpy(log_name, name);
+  fd = open(name, O_WRONLY | O_CREAT | O_APPEND, 0666);
+  if (fd < 0)
+    die("Unable to open log file %s: %m", name);
+  close(2);
+  dup(fd);
+  close(fd);
+}
+
+static void
+vlog(unsigned int cat, const char *msg, va_list args)
 {
   time_t tim = time(NULL);
   struct tm *tm = localtime(&tim);
   char buf[32];
 
-  if (!log_pid)
-    log_pid = getpid();
+  log_switch(tm);
   strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm);
   fprintf(stderr, "%c %s ", cat, buf);
   if (log_progname)
-    fprintf(stderr, "[%s (%d)] ", log_progname, log_pid);
+    {
+      if (log_pid)
+	fprintf(stderr, "[%s (%d)] ", log_progname, log_pid);
+      else
+	fprintf(stderr, "[%s] ", log_progname);
+    }
+  else
+    {
+      if (log_pid)
+	fprintf(stderr, "[%d] ", log_pid);
+    }
   vfprintf(stderr, msg, args);
   fputc('\n', stderr);
   fflush(stderr);
 }
 
 void
-log(unsigned int cat, byte *msg, ...)
+log(unsigned int cat, const char *msg, ...)
 {
   va_list args;
 
@@ -62,7 +94,7 @@ die(byte *msg, ...)
 }
 
 static byte *
-basename(byte *n)
+log_basename(byte *n)
 {
   byte *p = n;
 
@@ -76,7 +108,7 @@ void
 log_init(byte *argv0)
 {
   if (argv0)
-    log_progname = basename(argv0);
+    log_progname = log_basename(argv0);
 }
 
 void
@@ -84,11 +116,11 @@ log_file(byte *name)
 {
   if (name)
     {
-      int fd = open(name, O_WRONLY | O_CREAT | O_APPEND, 0666);
-      if (fd < 0)
-	die("Unable to open log file %s: %m", name);
-      close(2);
-      dup(fd);
-      close(fd);
+      time_t tim = time(NULL);
+      struct tm *tm = localtime(&tim);
+      strcpy(log_name_patt, name);
+      log_params = !!strchr(name, '%');
+      log_name[0] = 0;
+      log_switch(tm);
     }
 }