1bcdcd2ef
Denis Vlasenko
2008-12-09
Subject
init: do not eat last char in messages; do not print duplicate "init:" prefix to syslog
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
init/init.c+7 -7
| @@ -118,18 +118,18 @@ static void message(int where, const char *fmt, ...) | |
| msg[0] = '\r'; | |
| va_start(arguments, fmt); | |
| - | l = vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments); |
| - | if (l > sizeof(msg) - 2) |
| - | l = sizeof(msg) - 2; |
| + | l = 1 + vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments); |
| + | if (l > sizeof(msg) - 1) |
| + | l = sizeof(msg) - 1; |
| msg[l] = '\0'; | |
| va_end(arguments); | |
| if (ENABLE_FEATURE_INIT_SYSLOG) { | |
| - | /* Log the message to syslogd */ |
| if (where & L_LOG) { | |
| - | /* don't print out "\r" */ |
| - | openlog(applet_name, 0, LOG_DAEMON); |
| - | syslog(LOG_INFO, "init: %s", msg + 1); |
| + | /* Log the message to syslogd */ |
| + | openlog("init", 0, LOG_DAEMON); |
| + | /* don't print "\r" */ |
| + | syslog(LOG_INFO, "%s", msg + 1); |
| closelog(); | |
| } | |
| msg[l++] = '\n'; | |