=================================================================== RCS file: /cvs/cvs/blind/log.c,v retrieving revision 1.3 retrieving revision 1.7 diff -u -p -r1.3 -r1.7 --- blind/log.c 2022/03/17 10:20:47 1.3 +++ blind/log.c 2022/03/19 06:16:18 1.7 @@ -15,23 +15,29 @@ */ #include +#include #include #include +#include +#include #include static int log_background; static int log_verbose; const char *log_procname; -void log_init(int, int); -void log_setv(int); -int log_getv(void); -void log_info(const char *, ...) +void log_init(int, int); +void log_setv(int); +int log_getv(void); +void log_send(const char *, va_list) + __attribute__((__format__ (printf, 1, 0))); +void log_info(const char *, ...) __attribute__((__format__ (printf, 1, 2))); -void log_debug(const char *, ...) +void log_debug(const char *, ...) __attribute__((__format__ (printf, 1, 2))); +__dead void log_fatal(const char *, ...) + __attribute__((__format__ (printf, 1, 2))); - void log_init(int background, int facility) { @@ -60,19 +66,25 @@ log_getv(void) } void +log_send(const char *info, va_list ap) +{ + if (info != NULL) { + if (log_background) + vsyslog(LOG_INFO, info, ap); + else { + vfprintf(stderr, info, ap); + fprintf(stderr, "\n"); + } + } +} + +void log_info(const char *info, ...) { va_list ap; va_start(ap, info); - - if (log_background) - vsyslog(LOG_INFO, info, ap); - else { - vfprintf(stderr, info, ap); - fprintf(stderr, "\n"); - } - + log_send(info, ap); va_end(ap); } @@ -83,14 +95,19 @@ log_debug(const char *info, ...) if (log_verbose) { va_start(ap, info); - - if (log_background) - vsyslog(LOG_INFO, info, ap); - else { - vfprintf(stderr, info, ap); - fprintf(stderr, "\n"); - } - + log_send(info, ap); va_end(ap); } +} + +void +log_fatal(const char *info, ...) +{ + va_list ap; + + va_start(ap, info); + log_send(info, ap); + va_end(ap); + log_info("%s", strerror(errno)); + exit(1); }