Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add more locking (when we read and write fields)

Browse Source
This commit is contained in:
christos 2012-10-10 23:53:43 +00:00
parent fea19ff7ed
commit 156eeee6c3
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libc/gen/syslog.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syslog.c,v 1.51 2012/10/10 22:50:51 christos Exp $ */
/* $NetBSD: syslog.c,v 1.52 2012/10/10 23:53:43 christos Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
#else
__RCSID("$NetBSD: syslog.c,v 1.51 2012/10/10 22:50:51 christos Exp $");
__RCSID("$NetBSD: syslog.c,v 1.52 2012/10/10 23:53:43 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -289,13 +289,19 @@ vsyslogp_r(int pri, struct syslog_data *data, const char *msgid,
}
} else {
prlen = snprintf_ss(p, tbuf_left, "-");
/* if gmtime_r() was signal-safe we could output the UTC-time:
#if 0
/*
* if gmtime_r() was signal-safe we could output
* the UTC-time:
*/
gmtime_r(&now, &tmnow);
prlen = strftime(p, tbuf_left, "%FT%TZ", &tmnow);
*/
#endif
}
if (data == &sdata)
mutex_lock(&syslog_mutex);
if (data->log_hostname[0] == '\0' && gethostname(data->log_hostname,
sizeof(data->log_hostname)) == -1) {
/* can this really happen? */
@ -312,6 +318,10 @@ vsyslogp_r(int pri, struct syslog_data *data, const char *msgid,
DEC();
prlen = snprintf_ss(p, tbuf_left, "%s ",
data->log_tag ? data->log_tag : "-");
if (data == &sdata)
mutex_unlock(&syslog_mutex);
if (data->log_stat & (LOG_PERROR|LOG_CONS)) {
iovcnt = 0;
iov[iovcnt].iov_base = p;