wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-03 06:23:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault on X86_64, call va_end()+va_start() for each vfprintf()

Browse Source 
... varargs is a special kind of hell.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2017-12-23 00:38:01 +01:00
parent 8992e7bf2b
commit f7c0366fa2
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/log.c
+25 -27
View File
@@ -105,45 +105,43 @@ int log_is_debug(void)
return debug;
}
static void early_logit(int prio, const char *fmt, va_list ap)
{
FILE *fp;
if (!debug && prio > loglevel)
return;
fp = fopen("/dev/kmsg", "w");
if (fp) {
fprintf(fp, "<%d>finit[1]:", LOG_DAEMON | prio);
vfprintf(fp, fmt, ap);
fclose(fp);
if (debug)
vfprintf(stderr, fmt, ap);
} else {
vfprintf(stderr, fmt, ap);
}
}
/*
* Log to /dev/kmsg until syslogd has started, then openlog()
* and continue logging as a regular daemon.
*/
void logit(int prio, const char *fmt, ...)
{
FILE *fp;
va_list ap;
va_start(ap, fmt);
if (!up) {
if (!fexist("/dev/log")) {
early_logit(prio, fmt, ap);
goto done;
}
log_open();
if (up || fexist("/dev/log")) {
if (!up)
log_open();
vsyslog(prio, fmt, ap);
goto done;
}
if (!debug && prio > loglevel)
goto done;
fp = fopen("/dev/kmsg", "w");
if (!fp) {
vfprintf(stderr, fmt, ap);
goto done;
}
fprintf(fp, "<%d>finit[1]:", LOG_DAEMON | prio);
vfprintf(fp, fmt, ap);
fclose(fp);
if (debug) {
va_end(ap);
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
}
vsyslog(prio, fmt, ap);
done:
va_end(ap);
}