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 53b85d3..66d4cc2 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.23  2000-03-14 09:06:11  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
@@ -109,6 +116,10 @@
 #include <config.h>
 #endif
 
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -150,14 +161,14 @@ static struct {
     { 0, NULL }
 };  
 
-FILE *log_file(void)
+FILE *yaz_log_file(void)
 {
     if (!l_file)
         l_file = stderr;
     return l_file;
 }
 
-void log_init_file (const char *fname)
+void yaz_log_init_file (const char *fname)
 {
     FILE *new_file;
     if (!l_file)
@@ -174,22 +185,22 @@ void log_init_file (const char *fname)
     l_file = new_file;
 }
 
-void log_init_level (int level)
+void yaz_log_init_level (int level)
 {
     l_level = level;
 }
 
-void log_init_prefix (const char *prefix)
+void yaz_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)
+void yaz_log_init(int level, const char *prefix, const char *fname)
 {
-    log_init_level (level);
-    log_init_prefix (prefix);
-    log_init_file (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;
@@ -238,7 +249,26 @@ void yaz_log(int level, const char *fmt, ...)
     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);
@@ -250,12 +280,12 @@ void yaz_log(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;