Added prototype for data1_get_map_buf.

[yaz-moved-to-github.git] / util / log.c

diff --git a/util/log.c b/util/log.c
index ff1aa84..b648bf1 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1997, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.13  1997-09-01 08:54:13  adam
+ * Revision 1.16  1997-10-06 08:55:07  adam
+ * Changed log_init so that previous (if any) is closed.
+ *
+ * Revision 1.15  1997/09/29 07:13:13  adam
+ * Minor changes.
+ *
+ * Revision 1.14  1997/09/18 08:48:09  adam
+ * Fixed minor bug that caused log_init to ignore filename.
+ *
+ * Revision 1.13  1997/09/01 08:54:13  adam
  * New windows NT/95 port using MSV5.0. Made prefix query handling
  * thread safe. The function options ignores empty arguments when met.
  *
@@ -117,25 +126,35 @@ char *strerror(int n)
 
 FILE *log_file(void)
 {
+    if (!l_file)
+        l_file = stderr;
     return l_file;
 }
 
 void log_init(int level, const char *prefix, const char *name)
 {
+    FILE *new_file;
     l_level = level;
     if (prefix && *prefix)
        sprintf(l_prefix, "%.512s", prefix);
-    if (!name || !*name || l_file != stderr)
-       return;
-    if (!(l_file = fopen(name, "a")))
+    if (!l_file)
+        l_file = stderr;
+    if (!name || !*name)
+        return;
+    if (!(new_file = fopen(name, "a")))
         return;
-    setvbuf(l_file, 0, _IONBF, 0);
+    if (l_file != stderr)
+    {
+        setvbuf(new_file, 0, _IONBF, 0);
+        fclose (l_file);
+    }
+    l_file = new_file;
 }
 
 static void (*start_hook_func)(int, const char *, void *) = NULL;
-void *start_hook_info;
+static void *start_hook_info;
 static void (*end_hook_func)(int, const char *, void *) = NULL;
-void *end_hook_info;
+static void *end_hook_info;
 
 void log_event_start (void (*func)(int, const char *, void *), void *info)
 {