NMEM thread safe. NMEM must be initialized before use (sigh) -

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

diff --git a/util/log.c b/util/log.c
index 72e48cf..380b037 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,20 @@
 /*
- * 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.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 +81,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
 #include <log.h>
 
 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,8 +106,9 @@ static struct {
     { 0, NULL }
 };  
 
-#ifndef strerror
 
+#ifndef strerror
+#ifndef WINDOWS
 char *strerror(int n)
 {
         extern char *sys_errlist[];
@@ -104,6 +116,7 @@ char *strerror(int n)
 }
 
 #endif
+#endif
 
 FILE *log_file(void)
 {
@@ -115,7 +128,9 @@ void log_init(int level, const char *prefix, const char *name)
     l_level = level;
     if (prefix && *prefix)
        sprintf(l_prefix, "%.512s", prefix);
-    if (!name || !*name || l_file != stderr)
+    if (!name || !*name)
+        return;
+    if (l_file != stderr && l_file != 0)
        return;
     if (!(l_file = fopen(name, "a")))
         return;
@@ -151,6 +166,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 +193,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 +209,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)