=================================================================== RCS file: /cvs/cvs/blind/log.c,v retrieving revision 1.4 retrieving revision 1.7 diff -u -p -r1.4 -r1.7 --- blind/log.c 2022/03/18 09:20:46 1.4 +++ blind/log.c 2022/03/19 06:16:18 1.7 @@ -1,5 +1,5 @@ /* -1;95;0c * Copyright (c) 2022 Daniel Kroczynski + * Copyright (c) 2022 Daniel Kroczynski * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,23 +15,28 @@ */ #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_send(const char *, va_list) +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 *, ...) +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) @@ -63,11 +68,13 @@ log_getv(void) void log_send(const char *info, va_list ap) { - if (log_background) - vsyslog(LOG_INFO, info, ap); - else { - vfprintf(stderr, info, ap); - fprintf(stderr, "\n"); + if (info != NULL) { + if (log_background) + vsyslog(LOG_INFO, info, ap); + else { + vfprintf(stderr, info, ap); + fprintf(stderr, "\n"); + } } } @@ -91,4 +98,16 @@ log_debug(const char *info, ...) 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); }