X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Flog.c;h=72e48cf9402b35090b23bb254d4828ffebb9c792;hb=de62d4d97943ed7033f48bdbcaf06f67952f86fe;hp=4793f616ae726514c8f833fb49a09fc28a2aed90;hpb=945f86bd3958b5d36aaaeb4be945b0a8632f3b40;p=yaz-moved-to-github.git

diff --git a/util/log.c b/util/log.c
index 4793f61..72e48cf 100644
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,41 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.1  1995-03-30 10:26:53  quinn
+ * 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
+ * Debuggng & adjustments.
+ *
+ * Revision 1.3  1995/04/10  10:23:51  quinn
+ * Fixes.
+ *
+ * Revision 1.2  1995/03/31  10:16:55  quinn
+ * Fixed logging.
+ *
+ * Revision 1.1  1995/03/30  10:26:53  quinn
  * Logging system
  *
  * Revision 1.9  1994/12/12  12:09:02  quinn
@@ -37,16 +68,17 @@
  *
  */
 
-#include <log.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.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 char l_prefix[512] = "log";
 
 static struct {
     int mask;
@@ -57,22 +89,54 @@ static struct {
     { LOG_DEBUG, "debug"},
     { LOG_WARN,  "warn" },
     { LOG_LOG,   "log"  },
-    { LOG_ERRNO, "errno"},
+    { LOG_ERRNO, ""},
     { LOG_ALL,   "all"  },
     { 0,         "none" },
     { 0, NULL }
 };  
 
+#ifndef strerror
+
+char *strerror(int n)
+{
+        extern char *sys_errlist[];
+        return sys_errlist[n];
+}
+
+#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);
+    	sprintf(l_prefix, "%.512s", prefix);
     if (!name || !*name || l_file != stderr)
 	return;
     if (!(l_file = fopen(name, "a")))
         return;
-    setbuffer(l_file, 0, 0);
+    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, ...)
@@ -80,6 +144,10 @@ void logf(int level, const char *fmt, ...)
     va_list ap;
     char buf[4096], flags[1024];
     int i;
+    time_t ti;
+    struct tm *tim;
+    char tbuf[50];
+    int o_level = level;
 
     if (!(level & l_level))
     	return;
@@ -87,15 +155,23 @@ void logf(int level, const char *fmt, ...)
     for (i = 0; level && mask_names[i].name; i++)
     	if (mask_names[i].mask & level)
     	{
-	    sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
+	    if (*mask_names[i].name)
+		sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
 	    level -= mask_names[i].mask;
 	}
     va_start(ap, fmt);
     vsprintf(buf, fmt, ap);
-    if (level & LOG_ERRNO)
+    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)