X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Flog.c;h=380b037435c7f01b615b8c6ad9d14c28d716eed6;hp=a9fb5fc717f4057ebb646f02a4a0b8edbce60d0f;hb=eb0f67241481fb645a377b1c5df9683f8f1bd2fb;hpb=99268f722648e84bf5c54eb685a1434e100f38a1

diff --git a/util/log.c b/util/log.c
index a9fb5fc..380b037 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.5  1995-05-16 08:51:11  quinn
+ * 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
+ * Added log_file()
+ *
+ * Revision 1.6  1995/06/15  15:45:03  quinn
+ * Added date info.
+ *
+ * Revision 1.5  1995/05/16  08:51:11  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.4  1995/05/15  11:56:55  quinn
@@ -49,16 +78,18 @@
  *
  */
 
-#include <log.h>
 #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 char l_prefix[30] = "log";
+static FILE *l_file = NULL;
+static char l_prefix[512] = "log";
 
 static struct {
     int mask;
@@ -75,8 +106,9 @@ static struct {
     { 0, NULL }
 };  
 
-#ifndef strerror
 
+#ifndef strerror
+#ifndef WINDOWS
 char *strerror(int n)
 {
         extern char *sys_errlist[];
@@ -84,29 +116,58 @@ char *strerror(int n)
 }
 
 #endif
+#endif
+
+FILE *log_file(void)
+{
+    return l_file;
+}
 
 void log_init(int level, const char *prefix, const char *name)
 {
     l_level = level;
     if (prefix && *prefix)
-    	strcpy(l_prefix, prefix);
-    if (!name || !*name || l_file != stderr)
+    	sprintf(l_prefix, "%.512s", prefix);
+    if (!name || !*name)
+        return;
+    if (l_file != stderr && l_file != 0)
 	return;
     if (!(l_file = fopen(name, "a")))
         return;
     setvbuf(l_file, 0, _IONBF, 0);
 }
 
+static void (*start_hook_func)(int, const char *, void *) = NULL;
+void *start_hook_info;
+static void (*end_hook_func)(int, const char *, void *) = NULL;
+void *end_hook_info;
+
+void log_event_start (void (*func)(int, const char *, void *), void *info)
+{
+    start_hook_func = func;
+    start_hook_info = info;
+}
+
+void log_event_end (void (*func)(int, const char *, void *), void *info)
+{
+    end_hook_func = func;
+    end_hook_info = info;
+}
+
 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)
@@ -117,16 +178,28 @@ void 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));
-    fprintf(l_file, "%s: %s %s\n", l_prefix, flags, buf);
+    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 log_mask_str_x (const char *str, int level)
+{
     const char *p;
-    int i, level = LOG_DEFAULT_LEVEL;
+    int i;
 
     while (*str)
     {
@@ -136,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)