X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Flog.c;h=b2b8c0d287ff5651f6fe028d454a62e811002ad8;hb=6d04fc7a64ab1dd82574935bb189e055fe2d5e72;hp=1b423baaaefc7010a101d4a17df3f4f0e640170e;hpb=c8cc5d797f7f1b2512bd34154c78360c1eeebb79;p=yaz-moved-to-github.git

diff --git a/util/log.c b/util/log.c
index 1b423ba..b2b8c0d 100644
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.17  1997-12-09 16:11:02  adam
+ * Revision 1.22  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.21  2000/02/28 11:20:06  adam
+ * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
+ *
+ * Revision 1.20  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.19  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.18  1998/10/28 10:27:00  adam
+ * New functions log_init_file, log_init_level, log_init_prefix.
+ *
+ * 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
@@ -87,6 +102,10 @@
  *
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -94,7 +113,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
-#include <log.h>
+#include <yaz/log.h>
 
 #define HAS_STRERROR 1
 
@@ -135,26 +154,41 @@ FILE *log_file(void)
     return l_file;
 }
 
-void log_init(int level, const char *prefix, const char *name)
+void log_init_file (const char *fname)
 {
     FILE *new_file;
-    l_level = level;
-    if (prefix && *prefix)
-    	sprintf(l_prefix, "%.512s", prefix);
     if (!l_file)
         l_file = stderr;
-    if (!name || !*name)
+    if (!fname || !*fname)
         return;
-    if (!(new_file = fopen(name, "a")))
+    if (!(new_file = fopen(fname, "a")))
         return;
     if (l_file != stderr)
     {
-        setvbuf(new_file, 0, _IONBF, 0);
         fclose (l_file);
     }
+    setvbuf(new_file, 0, _IONBF, 0);
     l_file = new_file;
 }
 
+void log_init_level (int level)
+{
+    l_level = level;
+}
+
+void log_init_prefix (const char *prefix)
+{
+    if (prefix && *prefix)
+    	sprintf(l_prefix, "%.512s", prefix);
+}
+
+void log_init(int level, const char *prefix, const char *fname)
+{
+    log_init_level (level);
+    log_init_prefix (prefix);
+    log_init_file (fname);
+}
+
 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;
@@ -172,7 +206,7 @@ void log_event_end (void (*func)(int, const char *, void *), void *info)
     end_hook_info = info;
 }
 
-void logf(int level, const char *fmt, ...)
+void yaz_log(int level, const char *fmt, ...)
 {
     va_list ap;
     char buf[4096], flags[1024];