X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Flog.c;h=1b423baaaefc7010a101d4a17df3f4f0e640170e;hb=142235dcf39ff59a20918e53abcf62f59fa9f2a4;hp=76eaf1b36b42884fb6cd3e71346161fd0b0369dd;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/util/log.c b/util/log.c
index 76eaf1b..1b423ba 100644
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,39 @@
 /*
- * 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.8  1995-09-27 15:03:02  quinn
+ * 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
+ * Fixed the log-prefix buffer - it was too small and the setup code lacked
+ * a bounds-check.
+ *
+ * Revision 1.9  1995/09/29  17:12:34  quinn
+ * Smallish
+ *
+ * Revision 1.8  1995/09/27  15:03:02  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.7  1995/06/19  12:40:18  quinn
@@ -61,14 +90,28 @@
 #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 char l_prefix[30] = "log";
+static FILE *l_file = NULL;
+static char l_prefix[512] = "log";
 
 static struct {
     int mask;
@@ -85,46 +128,64 @@ static struct {
     { 0, NULL }
 };  
 
-#ifndef strerror
+FILE *log_file(void)
+{
+    if (!l_file)
+        l_file = stderr;
+    return l_file;
+}
 
-char *strerror(int n)
+void log_init(int level, const char *prefix, const char *name)
 {
-        extern char *sys_errlist[];
-        return sys_errlist[n];
+    FILE *new_file;
+    l_level = level;
+    if (prefix && *prefix)
+    	sprintf(l_prefix, "%.512s", prefix);
+    if (!l_file)
+        l_file = stderr;
+    if (!name || !*name)
+        return;
+    if (!(new_file = fopen(name, "a")))
+        return;
+    if (l_file != stderr)
+    {
+        setvbuf(new_file, 0, _IONBF, 0);
+        fclose (l_file);
+    }
+    l_file = new_file;
 }
 
-#endif
+static void (*start_hook_func)(int, const char *, void *) = NULL;
+static void *start_hook_info;
+static void (*end_hook_func)(int, const char *, void *) = NULL;
+static void *end_hook_info;
 
-FILE MDF *log_file(void)
+void log_event_start (void (*func)(int, const char *, void *), void *info)
 {
-    return l_file;
+    start_hook_func = func;
+    start_hook_info = info;
 }
 
-void MDF log_init(int level, const char *prefix, const char *name)
+void log_event_end (void (*func)(int, const char *, void *), void *info)
 {
-    l_level = level;
-    if (prefix && *prefix)
-    	strcpy(l_prefix, prefix);
-    if (!name || !*name || l_file != stderr)
-	return;
-    if (!(l_file = fopen(name, "a")))
-        return;
-    setvbuf(l_file, 0, _IONBF, 0);
+    end_hook_func = func;
+    end_hook_info = info;
 }
 
-void MDF logf(int level, const char *fmt, ...)
+void logf(int level, const char *fmt, ...)
 {
     va_list ap;
     char buf[4096], flags[1024];
-    int i, p_error = 0;
+    int i;
     time_t ti;
     struct tm *tim;
     char tbuf[50];
+    int o_level = level;
 
     if (!(level & l_level))
     	return;
-    if (level & LOG_ERRNO)
-    	p_error = 1;
+    if (!l_file)
+        l_file = stderr;
     *flags = '\0';
     for (i = 0; level && mask_names[i].name; i++)
     	if (mask_names[i].mask & level)
@@ -135,19 +196,28 @@ void MDF logf(int level, const char *fmt, ...)
 	}
     va_start(ap, fmt);
     vsprintf(buf, fmt, ap);
-    if (p_error)
+    if (o_level & LOG_ERRNO)
     	sprintf(buf + strlen(buf), " [%s]", strerror(errno));
+    if (start_hook_func)
+        (*start_hook_func)(o_level, buf, start_hook_info);
     ti = time(0);
     tim = localtime(&ti);
     strftime(tbuf, 50, "%H:%M:%S-%d/%m", tim);
     fprintf(l_file, "%s: %s: %s %s\n", tbuf, l_prefix, flags, buf);
     fflush(l_file);
+    if (end_hook_func)
+	(*end_hook_func)(o_level, buf, end_hook_info);
+}
+
+int log_mask_str (const char *str)
+{
+    return log_mask_str_x (str, LOG_DEFAULT_LEVEL);
 }
 
-int MDF log_mask_str (const char *str)
+int log_mask_str_x (const char *str, int level)
 {
     const char *p;
-    int i, level = LOG_DEFAULT_LEVEL;
+    int i;
 
     while (*str)
     {
@@ -157,7 +227,7 @@ int MDF 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)