diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-31 03:33:50 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-31 03:33:50 +0000 |
commit | 15c0b725849875c718b168a26e13872e163cde4c (patch) | |
tree | 687a5425953ae362ef285c6c671f09a05d3fa3c0 /init | |
parent | ccdc13d306c0a8d2735488bf8e46503f7e567767 (diff) | |
download | busybox-w32-1_13_2.tar.gz busybox-w32-1_13_2.tar.bz2 busybox-w32-1_13_2.zip |
Apply post 1.13.1 patches, bump to 1.13.21_13_2
Diffstat (limited to '')
-rw-r--r-- | init/init.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/init/init.c b/init/init.c index 1caf45b8d..10f5ba68d 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -118,18 +118,18 @@ static void message(int where, const char *fmt, ...) | |||
118 | 118 | ||
119 | msg[0] = '\r'; | 119 | msg[0] = '\r'; |
120 | va_start(arguments, fmt); | 120 | va_start(arguments, fmt); |
121 | l = vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments); | 121 | l = 1 + vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments); |
122 | if (l > sizeof(msg) - 2) | 122 | if (l > sizeof(msg) - 1) |
123 | l = sizeof(msg) - 2; | 123 | l = sizeof(msg) - 1; |
124 | msg[l] = '\0'; | 124 | msg[l] = '\0'; |
125 | va_end(arguments); | 125 | va_end(arguments); |
126 | 126 | ||
127 | if (ENABLE_FEATURE_INIT_SYSLOG) { | 127 | if (ENABLE_FEATURE_INIT_SYSLOG) { |
128 | /* Log the message to syslogd */ | ||
129 | if (where & L_LOG) { | 128 | if (where & L_LOG) { |
130 | /* don't print out "\r" */ | 129 | /* Log the message to syslogd */ |
131 | openlog(applet_name, 0, LOG_DAEMON); | 130 | openlog("init", 0, LOG_DAEMON); |
132 | syslog(LOG_INFO, "init: %s", msg + 1); | 131 | /* don't print "\r" */ |
132 | syslog(LOG_INFO, "%s", msg + 1); | ||
133 | closelog(); | 133 | closelog(); |
134 | } | 134 | } |
135 | msg[l++] = '\n'; | 135 | msg[l++] = '\n'; |