Makefile: fixed compilation of tests

[libucw.git] / lib / log-file.c

diff --git a/lib/log-file.c b/lib/log-file.c
index 20dea918c80ae13813913ecd05f58a7b4d99971d..401e797c3edeca4d4e5a529bc4b0e12debb13c30 100644 (file)
--- a/lib/log-file.c
+++ b/lib/log-file.c
@@ -1,7 +1,7 @@
 /*
  *     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.
@@ -9,6 +9,7 @@
 
 #include "lib/lib.h"
 #include "lib/lfs.h"
+#include "lib/threads.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -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)
@@ -41,14 +43,12 @@ do_log_switch(struct tm *tm)
       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)
     {