X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Flog.c;h=5a61699255c349ef562a632b37fc973ae722a544;hb=32882a6e0491347b494586011a5df7bfadbc6675;hp=42e1167a30c647f2e3ba4360cdd79a1296fd9172;hpb=cdf2ebfab56b50232a49bc4032d90704794ca4c0;p=yaz-moved-to-github.git

diff --git a/util/log.c b/util/log.c
index 42e1167..5a61699 100644
--- 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.28 2002-08-29 09:58:42 adam Exp $
+ * $Id: log.c,v 1.38 2003-05-22 13:15:08 heikki Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -20,6 +20,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
+#include <yaz/nmem.h>
 #include <yaz/log.h>
 
 #define HAS_STRERROR 1
@@ -51,6 +52,10 @@ static struct {
     { LOG_LOG,   "log"  },
     { LOG_ERRNO, ""},
     { LOG_MALLOC, "malloc"},
+    { LOG_APP,   "app"  },
+    { LOG_NOTIME, "" },
+    { LOG_APP2  , "app2" },
+    { LOG_APP3  , "app3" },
     { LOG_ALL,   "all"  },
     { 0,         "none" },
     { 0, NULL }
@@ -69,8 +74,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)
     {
@@ -105,7 +110,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;
@@ -132,7 +138,7 @@ void yaz_log(int level, const char *fmt, ...)
     int i;
     time_t ti;
     struct tm *tim;
-    char tbuf[50];
+    char tbuf[50]="";
     int o_level = level;
 
     if (!(level & l_level))
@@ -161,31 +167,20 @@ 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(errno));
-#endif
+        strcat(buf, " [");
+        yaz_strerror(buf+strlen(buf), 2048);
+        strcat(buf, "]");
     }
+    va_end (ap);
     if (start_hook_func)
         (*start_hook_func)(o_level, buf, start_hook_info);
     ti = time(0);
     tim = localtime(&ti);
-    strftime(tbuf, 50, "%H:%M:%S-%d/%m", tim);
-    fprintf(l_file, "%s: %s%s %s%s\n", tbuf, l_prefix, flags,
+    if (l_level & LOG_NOTIME)
+      tbuf[0]='\0';
+    else
+      strftime(tbuf, 50, "%H:%M:%S-%d/%m: ", tim);
+    fprintf(l_file, "%s%s%s %s%s\n", tbuf, l_prefix, flags,
             l_prefix2, buf);
     fflush(l_file);
     if (end_hook_func)