Added a way to get log back to stderr

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

diff --git a/util/log.c b/util/log.c
index 5520419..5056d01 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.31 2002-11-26 16:56:39 adam Exp $
+ * $Id: log.c,v 1.34 2003-02-07 14:39:00 heikki Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -70,8 +70,8 @@ void yaz_log_init_file (const char *fname)
     if (!l_file)
         l_file = stderr;
     if (!fname || !*fname)
-        return;
-    if (!(new_file = fopen(fname, "a")))
+       new_file=stderr;
+    else if (!(new_file = fopen(fname, "a")))
         return;
     if (l_file != stderr)
     {
@@ -106,7 +106,8 @@ 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);
+    if (fname && *fname)
+        yaz_log_init_file (fname);
 }
 
 static void (*start_hook_func)(int, const char *, void *) = NULL;
@@ -162,24 +163,9 @@ void yaz_log(int level, const char *fmt, ...)
 /* WIN32 */
     if (o_level & LOG_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(yaz_errno()));
-#endif
+       strcat(buf, " [");
+       yaz_strerror(buf+strlen(buf), 2048);
+       strcat(buf, "]");
     }
     va_end (ap);
     if (start_hook_func)