X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Flog.c;h=1b423baaaefc7010a101d4a17df3f4f0e640170e;hp=72e48cf9402b35090b23bb254d4828ffebb9c792;hb=ffb88e8bb97c6e24989b7f04b8bbf1a4203d2f72;hpb=069f580ad7901713aaf7bb8d27aaba82124c15c7

diff --git a/util/log.c b/util/log.c
index 72e48cf..1b423ba 100644
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,29 @@
 /*
- * 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.11  1996-02-05 12:24:32  adam
+ * Revision 1.17  1997-12-09 16:11:02  adam
+ * Assume strerror is defined on Unixes as well. It's standard ANSI.
+ *
+ * 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.
+ *
+ * Revision 1.12  1997/05/01 15:08:14  adam
+ * Added log_mask_str_x routine.
+ *
+ * Revision 1.11  1996/02/05 12:24:32  adam
  * Implemented log_event_{start,end}-functions.
  *
  * Revision 1.10  1995/12/06  09:51:27  quinn
@@ -71,13 +90,27 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
 #include <log.h>
 
+#define HAS_STRERROR 1
+
+#if HAS_STRERROR
+
+#else
+char *strerror(int n)
+{
+        extern char *sys_errlist[];
+        return sys_errlist[n];
+}
+
+#endif
+
 static int l_level = LOG_DEFAULT_LEVEL;
-static FILE *l_file = stderr;
+static FILE *l_file = NULL;
 static char l_prefix[512] = "log";
 
 static struct {
@@ -95,37 +128,37 @@ static struct {
     { 0, NULL }
 };  
 
-#ifndef strerror
-
-char *strerror(int n)
-{
-        extern char *sys_errlist[];
-        return sys_errlist[n];
-}
-
-#endif
-
 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)
 {
@@ -151,6 +184,8 @@ void logf(int level, const char *fmt, ...)
 
     if (!(level & l_level))
     	return;
+    if (!l_file)
+        l_file = stderr;
     *flags = '\0';
     for (i = 0; level && mask_names[i].name; i++)
     	if (mask_names[i].mask & level)
@@ -176,8 +211,13 @@ void logf(int level, const char *fmt, ...)
 
 int log_mask_str (const char *str)
 {
+    return log_mask_str_x (str, LOG_DEFAULT_LEVEL);
+}
+
+int log_mask_str_x (const char *str, int level)
+{
     const char *p;
-    int i, level = LOG_DEFAULT_LEVEL;
+    int i;
 
     while (*str)
     {
@@ -187,7 +227,7 @@ int log_mask_str (const char *str)
             level = atoi (str);
         else
             for (i = 0; mask_names[i].name; i++)
-                if (strlen (mask_names[i].name) == p-str &&
+                if (strlen (mask_names[i].name) == (size_t) (p-str) &&
                     memcmp (mask_names[i].name, str, p-str) == 0)
                 {
                     if (mask_names[i].mask)