X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flog-file.c;h=401e797c3edeca4d4e5a529bc4b0e12debb13c30;hb=ab3b3f178718c0ae7b5738e987e350537574d2e6;hp=832296692f11ef78bd4e06a8b0f20109ba521b29;hpb=3ad85b1744b1c31891e7874a960b8881bca5688b;p=libucw.git

diff --git a/lib/log-file.c b/lib/log-file.c
index 83229669..401e797c 100644
--- a/lib/log-file.c
+++ b/lib/log-file.c
@@ -1,16 +1,17 @@
 /*
  *	UCW Library -- Keeping of Log Files
  *
- *	(c) 1997--2005 Martin Mares <mj@ucw.cz>
+ *	(c) 1997--2006 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
  */
 
 #include "lib/lib.h"
+#include "lib/lfs.h"
+#include "lib/threads.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -19,7 +20,7 @@
 static char *log_name_patt;
 static int log_params;
 static int log_filename_size;
-int log_switch_nest;
+volatile int log_switch_nest;
 
 static int
 do_log_switch(struct tm *tm)
@@ -31,6 +32,7 @@ do_log_switch(struct tm *tm)
   if (!log_name_patt ||
       log_filename[0] && !log_params)
     return 0;
+  ucwlib_lock();
   log_switch_nest++;
   l = strftime(name, log_filename_size, log_name_patt, tm);
   if (l < 0 || l >= log_filename_size)
@@ -38,17 +40,15 @@ do_log_switch(struct tm *tm)
   if (strcmp(name, log_filename))
     {
       strcpy(log_filename, name);
-      fd = open(name, O_WRONLY | O_CREAT | O_APPEND, 0666);
+      fd = sh_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);
+      dup2(fd, 2);
       close(fd);
-      close(1);
-      dup(2);
       switched = 1;
     }
   log_switch_nest--;
+  ucwlib_unlock();
   return switched;
 }
 
@@ -67,7 +67,7 @@ internal_log_switch(struct tm *tm)
 }
 
 void
-log_file(byte *name)
+log_file(const char *name)
 {
   if (name)
     {
@@ -85,8 +85,6 @@ log_file(byte *name)
       log_filename[0] = 0;
       log_switch();
       log_switch_hook = internal_log_switch;
-      close(0);
-      open("/dev/null", O_RDWR, 0);
     }
 }