diff options
| author |   benno <benno@openbsd.org> | 2017-01-23 08:40:07 +0000 |
|---|---|---|
| committer | benno <benno@openbsd.org> | 2017-01-23 08:40:07 +0000 |
| commit | 19200396b4b4d7e4ae4ab8023f457f04095bc42f (patch) | |
| tree | 56005c5ec4933a7f4b9aa92e5677f74c0c19c339 /usr.sbin/iscsid | |
| parent | whitespace (diff) | |
| download | wireguard-openbsd-19200396b4b4d7e4ae4ab8023f457f04095bc42f.tar.xz wireguard-openbsd-19200396b4b4d7e4ae4ab8023f457f04095bc42f.zip | |
copy log.c/h from bgpd.
ok claudio
Diffstat (limited to 'usr.sbin/iscsid')
| -rw-r--r-- | usr.sbin/iscsid/iscsid.c | 4 | ||||
| -rw-r--r-- | usr.sbin/iscsid/log.c | 22 | ||||
| -rw-r--r-- | usr.sbin/iscsid/log.h | 8 |
3 files changed, 24 insertions, 10 deletions
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index ae8bb8b8525..c100ef3dc5a 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iscsid.c,v 1.19 2016/08/16 18:41:57 tedu Exp $ */ +/* $OpenBSD: iscsid.c,v 1.20 2017/01/23 08:40:07 benno Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -71,6 +71,8 @@ main(int argc, char *argv[]) int name[] = { CTL_KERN, KERN_PROC_NOBROADCASTKILL, 0 }; int ch, debug = 0, verbose = 0, nobkill = 1; + log_procname = getprogname(); + log_init(1); /* log to stderr until daemonized */ log_verbose(1); diff --git a/usr.sbin/iscsid/log.c b/usr.sbin/iscsid/log.c index e1a6c753d05..79f827951c7 100644 --- a/usr.sbin/iscsid/log.c +++ b/usr.sbin/iscsid/log.c @@ -1,7 +1,6 @@ -/* $OpenBSD: log.c,v 1.7 2016/09/02 16:22:31 benno Exp $ */ +/* $OpenBSD: log.c,v 1.8 2017/01/23 08:40:07 benno Exp $ */ /* - * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any @@ -29,6 +28,7 @@ int debug; int verbose; +const char *log_procname; void log_init(int n_debug) @@ -135,15 +135,25 @@ log_debug(const char *emsg, ...) } void -fatal(const char *emsg) +fatal(const char *emsg, ...) { + char s[1024]; + va_list ap; + + va_start(ap, emsg); + vsnprintf(s, sizeof(s), emsg, ap); + va_end(ap); + if (emsg == NULL) - logit(LOG_CRIT, "fatal: %s", strerror(errno)); + logit(LOG_CRIT, "fatal in %s: %s", log_procname, + strerror(errno)); else if (errno) - logit(LOG_CRIT, "fatal: %s: %s", emsg, strerror(errno)); + logit(LOG_CRIT, "fatal in %s: %s: %s", + log_procname, s, strerror(errno)); else - logit(LOG_CRIT, "fatal: %s", emsg); + logit(LOG_CRIT, "fatal in %s: %s", + log_procname, s); exit(1); } diff --git a/usr.sbin/iscsid/log.h b/usr.sbin/iscsid/log.h index 745933b2f4a..abd99848a7c 100644 --- a/usr.sbin/iscsid/log.h +++ b/usr.sbin/iscsid/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.4 2016/09/02 16:22:31 benno Exp $ */ +/* $OpenBSD: log.h,v 1.5 2017/01/23 08:40:07 benno Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -22,6 +22,8 @@ #include <stdarg.h> #include <sys/cdefs.h> +extern const char *log_procname; + void log_init(int); void log_verbose(int); void logit(int, const char *, ...) @@ -36,8 +38,8 @@ void log_info(const char *, ...) __attribute__((__format__ (printf, 1, 2))); void log_debug(const char *, ...) __attribute__((__format__ (printf, 1, 2))); -void fatal(const char *) __dead - __attribute__((__format__ (printf, 1, 0))); +void fatal(const char *, ...) __dead + __attribute__((__format__ (printf, 1, 2))); void fatalx(const char *) __dead __attribute__((__format__ (printf, 1, 0))); |