X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Flog.c;h=134d7fd1cd91e58750481777430c11bba72d3fe9;hp=318adbd1dd1ba9225799c3e6b1aad28266f023bf;hb=63cafe41a93427118959a74201b3e331169a71d9;hpb=87a9bdcb0fda85461f9992519f4239645c8b2826 diff --git a/util/log.c b/util/log.c index 318adbd..134d7fd 100644 --- a/util/log.c +++ b/util/log.c @@ -1,10 +1,31 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: log.c,v $ - * Revision 1.2 1995-03-31 10:16:55 quinn + * Revision 1.9 1995-09-29 17:12:34 quinn + * Smallish + * + * 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 + * Debuggng & adjustments. + * + * Revision 1.3 1995/04/10 10:23:51 quinn + * Fixes. + * + * Revision 1.2 1995/03/31 10:16:55 quinn * Fixed logging. * * Revision 1.1 1995/03/30 10:26:53 quinn @@ -40,12 +61,13 @@ * */ -#include #include #include #include #include #include +#include +#include static int l_level = LOG_DEFAULT_LEVEL; static FILE *l_file = stderr; @@ -66,6 +88,21 @@ static struct { { 0, NULL } }; +#ifndef strerror + +char *strerror(int n) +{ + extern char *sys_errlist[]; + return sys_errlist[n]; +} + +#endif + +FILE *log_file(void) +{ + return l_file; +} + void log_init(int level, const char *prefix, const char *name) { l_level = level; @@ -75,7 +112,7 @@ void log_init(int level, const char *prefix, const char *name) return; if (!(l_file = fopen(name, "a"))) return; - setbuffer(l_file, 0, 0); + setvbuf(l_file, 0, _IONBF, 0); } void logf(int level, const char *fmt, ...) @@ -83,6 +120,9 @@ void 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; @@ -100,7 +140,10 @@ 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); }