X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Flog.c;h=76eaf1b36b42884fb6cd3e71346161fd0b0369dd;hb=a65e0f7a2d18e29a619b137b8a1ddbc55891d573;hp=a9fb5fc717f4057ebb646f02a4a0b8edbce60d0f;hpb=99268f722648e84bf5c54eb685a1434e100f38a1;p=yaz-moved-to-github.git diff --git a/util/log.c b/util/log.c index a9fb5fc..76eaf1b 100644 --- a/util/log.c +++ b/util/log.c @@ -4,7 +4,16 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: log.c,v $ - * Revision 1.5 1995-05-16 08:51:11 quinn + * Revision 1.8 1995-09-27 15:03:02 quinn + * Modified function heads & prototypes. + * + * Revision 1.7 1995/06/19 12:40:18 quinn + * Added log_file() + * + * Revision 1.6 1995/06/15 15:45:03 quinn + * Added date info. + * + * Revision 1.5 1995/05/16 08:51:11 quinn * License, documentation, and memory fixes * * Revision 1.4 1995/05/15 11:56:55 quinn @@ -49,12 +58,13 @@ * */ -#include #include #include #include #include #include +#include +#include static int l_level = LOG_DEFAULT_LEVEL; static FILE *l_file = stderr; @@ -85,7 +95,12 @@ char *strerror(int n) #endif -void log_init(int level, const char *prefix, const char *name) +FILE MDF *log_file(void) +{ + return l_file; +} + +void MDF log_init(int level, const char *prefix, const char *name) { l_level = level; if (prefix && *prefix) @@ -97,11 +112,14 @@ void log_init(int level, const char *prefix, const char *name) setvbuf(l_file, 0, _IONBF, 0); } -void logf(int level, const char *fmt, ...) +void MDF logf(int level, const char *fmt, ...) { va_list ap; char buf[4096], flags[1024]; int i, p_error = 0; + time_t ti; + struct tm *tim; + char tbuf[50]; if (!(level & l_level)) return; @@ -119,11 +137,14 @@ void logf(int level, const char *fmt, ...) vsprintf(buf, fmt, ap); if (p_error) sprintf(buf + strlen(buf), " [%s]", strerror(errno)); - fprintf(l_file, "%s: %s %s\n", l_prefix, flags, buf); + ti = time(0); + tim = localtime(&ti); + strftime(tbuf, 50, "%H:%M:%S-%d/%m", tim); + fprintf(l_file, "%s: %s: %s %s\n", tbuf, l_prefix, flags, buf); fflush(l_file); } -int log_mask_str (const char *str) +int MDF log_mask_str (const char *str) { const char *p; int i, level = LOG_DEFAULT_LEVEL;