diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-10-12 11:57:32 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-10-12 11:57:32 +0000 |
| commit | f703d9bfe498b762e723e7bcb8e23a4962484401 (patch) | |
| tree | ce6dbea3926dc79ec9e6deca8a4dbddfb08b5f7d /usr.sbin/switchd | |
| parent | e1a63779aecbcc3809d2a61067167013df50e094 (diff) | |
copy updated log.c from vmd: for correctness, save errno when doing
additional actions before printing it. OK rzalamena@
Diffstat (limited to 'usr.sbin/switchd')
| -rw-r--r-- | usr.sbin/switchd/log.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/usr.sbin/switchd/log.c b/usr.sbin/switchd/log.c index ecd94e44674..eb436e4fb62 100644 --- a/usr.sbin/switchd/log.c +++ b/usr.sbin/switchd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.1 2016/07/19 16:54:26 reyk Exp $ */ +/* $OpenBSD: log.c,v 1.2 2016/10/12 11:57:31 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -109,19 +109,21 @@ vlog(int pri, const char *fmt, va_list ap) void log_warn(const char *emsg, ...) { - char *nfmt; - va_list ap; + char *nfmt; + va_list ap; + int saved_errno = errno; /* best effort to even work in out of memory situations */ if (emsg == NULL) - logit(LOG_CRIT, "%s", strerror(errno)); + logit(LOG_CRIT, "%s", strerror(saved_errno)); else { va_start(ap, emsg); - if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) { + if (asprintf(&nfmt, "%s: %s", emsg, + strerror(saved_errno)) == -1) { /* we tried it... */ vlog(LOG_CRIT, emsg, ap); - logit(LOG_CRIT, "%s", strerror(errno)); + logit(LOG_CRIT, "%s", strerror(saved_errno)); } else { vlog(LOG_CRIT, nfmt, ap); free(nfmt); @@ -167,6 +169,7 @@ vfatal(const char *emsg, va_list ap) { static char s[BUFSIZ]; const char *sep; + int saved_errno = errno; if (emsg != NULL) { (void)vsnprintf(s, sizeof(s), emsg, ap); @@ -175,9 +178,9 @@ vfatal(const char *emsg, va_list ap) s[0] = '\0'; sep = ""; } - if (errno) + if (saved_errno) logit(LOG_CRIT, "%s: %s%s%s", - log_procname, s, sep, strerror(errno)); + log_procname, s, sep, strerror(saved_errno)); else logit(LOG_CRIT, "%s%s%s", log_procname, sep, s); } |