/*
- * 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.24 2000-09-04 08:58:15 adam
+ * Added prefix yaz_ for most logging utility functions.
+ *
+ * Revision 1.23 2000/03/14 09:06:11 adam
+ * Added POSIX threads support for frontend server.
+ *
+ * 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
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include <errno.h>
#include <time.h>
-#include <log.h>
+#include <yaz/log.h>
#define HAS_STRERROR 1
{ 0, NULL }
};
-FILE *log_file(void)
+FILE *yaz_log_file(void)
{
if (!l_file)
l_file = stderr;
return l_file;
}
-void log_init(int level, const char *prefix, const char *name)
+void yaz_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 yaz_log_init_level (int level)
+{
+ l_level = level;
+}
+
+void yaz_log_init_prefix (const char *prefix)
+{
+ if (prefix && *prefix)
+ sprintf(l_prefix, "%.512s", prefix);
+}
+
+void yaz_log_init(int level, const char *prefix, const char *fname)
+{
+ yaz_log_init_level (level);
+ yaz_log_init_prefix (prefix);
+ yaz_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;
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];
level -= mask_names[i].mask;
}
va_start(ap, fmt);
+#if HAVE_VSNPRINTF
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+#else
vsprintf(buf, fmt, ap);
+#endif
if (o_level & LOG_ERRNO)
sprintf(buf + strlen(buf), " [%s]", strerror(errno));
if (start_hook_func)
(*end_hook_func)(o_level, buf, end_hook_info);
}
-int log_mask_str (const char *str)
+int yaz_log_mask_str (const char *str)
{
- return log_mask_str_x (str, LOG_DEFAULT_LEVEL);
+ return yaz_log_mask_str_x (str, LOG_DEFAULT_LEVEL);
}
-int log_mask_str_x (const char *str, int level)
+int yaz_log_mask_str_x (const char *str, int level)
{
const char *p;
int i;