WIN32 fixes: Socket not re-used for bind. yaz_log logs WIN32 error

[yaz-moved-to-github.git] / util / log.c

diff --git a/util/log.c b/util/log.c
index afba6ec..66d4cc2 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,41 @@
 /*
- * 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.15  1997-09-29 07:13:13  adam
+ * Revision 1.25  2001-08-23 09:02:46  adam
+ * WIN32 fixes: Socket not re-used for bind. yaz_log logs WIN32 error
+ * message.
+ *
+ * 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
+ * Changed log_init so that previous (if any) is closed.
+ *
+ * Revision 1.15  1997/09/29 07:13:13  adam
  * Minor changes.
  *
  * Revision 1.14  1997/09/18 08:48:09  adam
@@ -81,6 +112,14 @@
  *
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -88,7 +127,20 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
-#include <log.h>
+#include <yaz/log.h>
+
+#define HAS_STRERROR 1
+
+#if HAS_STRERROR
+
+#else
+char *strerror(int n)
+{
+        extern char *sys_errlist[];
+        return sys_errlist[n];
+}
+
+#endif
 
 static int l_level = LOG_DEFAULT_LEVEL;
 static FILE *l_file = NULL;
@@ -109,35 +161,46 @@ static struct {
     { 0, NULL }
 };  
 
-
-#ifndef strerror
-#ifndef WINDOWS
-char *strerror(int n)
+FILE *yaz_log_file(void)
 {
-        extern char *sys_errlist[];
-        return sys_errlist[n];
+    if (!l_file)
+        l_file = stderr;
+    return l_file;
 }
 
-#endif
-#endif
-
-FILE *log_file(void)
+void yaz_log_init_file (const char *fname)
 {
-    return l_file;
+    FILE *new_file;
+    if (!l_file)
+        l_file = stderr;
+    if (!fname || !*fname)
+        return;
+    if (!(new_file = fopen(fname, "a")))
+        return;
+    if (l_file != stderr)
+    {
+        fclose (l_file);
+    }
+    setvbuf(new_file, 0, _IONBF, 0);
+    l_file = new_file;
 }
 
-void log_init(int level, const char *prefix, const char *name)
+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);
-    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);
+}
+
+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;
@@ -157,7 +220,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];
@@ -180,9 +243,32 @@ void logf(int level, const char *fmt, ...)
            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));
+    {
+#ifdef WIN32
+       DWORD err = GetLastError();
+       if (err)
+       {
+           strcat(buf, " [");
+           FormatMessage(
+               FORMAT_MESSAGE_FROM_SYSTEM,
+               NULL,
+               err,
+               MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+               (LPTSTR) buf + strlen(buf),
+               2048,
+               NULL);
+           strcat(buf, "]");
+       }
+#else
+        sprintf(buf + strlen(buf), " [%s]", strerror(errno));
+#endif
+    }
     if (start_hook_func)
         (*start_hook_func)(o_level, buf, start_hook_info);
     ti = time(0);
@@ -194,12 +280,12 @@ void logf(int level, const char *fmt, ...)
        (*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;