X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Flog.c;h=8102d2b50e8d43a05b78c40c328cf59cc46a753e;hb=39255c75cf4b692fec73ce3fe52cf56333189bfc;hp=9319154139c9c0ae99606981f00952b6c6f82848;hpb=8c0d9ab51d716e170e6185dbfeb9462d91fb1a06;p=yaz-moved-to-github.git

diff --git a/util/log.c b/util/log.c
index 9319154..8102d2b 100644
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,29 @@
 /*
- * 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.4  1995-05-15 11:56:55  quinn
+ * 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
@@ -46,16 +65,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;
@@ -82,11 +102,16 @@ char *strerror(int 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")))
@@ -99,6 +124,9 @@ void logf(int level, const char *fmt, ...)
     va_list ap;
     char buf[4096], flags[1024];
     int i, p_error = 0;
+    time_t ti;
+    struct tm *tim;
+    char tbuf[50];
 
     if (!(level & l_level))
     	return;
@@ -116,7 +144,10 @@ void logf(int level, const char *fmt, ...)
     vsprintf(buf, fmt, ap);
     if (p_error)
     	sprintf(buf + strlen(buf), " [%s]", strerror(errno));
-    fprintf(l_file, "%s: %s %s\n", l_prefix, flags, buf);
+    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);
 }