diff options
author | Erik Andersen <andersen@codepoet.org> | 2000-02-11 21:55:04 +0000 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 2000-02-11 21:55:04 +0000 |
commit | 9ffdaa647ee57263247e047e6c67c5a7fa1f2a6c (patch) | |
tree | 3485e1645439990642fcb941d579deb10f8a17a7 /sysklogd | |
parent | 5e1b2ca1161cba481ccf4873427389f59dbc23e0 (diff) | |
download | busybox-w32-9ffdaa647ee57263247e047e6c67c5a7fa1f2a6c.tar.gz busybox-w32-9ffdaa647ee57263247e047e6c67c5a7fa1f2a6c.tar.bz2 busybox-w32-9ffdaa647ee57263247e047e6c67c5a7fa1f2a6c.zip |
Updates
-Erik
Diffstat (limited to 'sysklogd')
-rw-r--r-- | sysklogd/syslogd.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index db535044c..d39cd6a0d 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
@@ -110,17 +110,19 @@ static void logMessage(int pri, char *msg) | |||
110 | { | 110 | { |
111 | time_t now; | 111 | time_t now; |
112 | char *timestamp; | 112 | char *timestamp; |
113 | static char res[20]; | 113 | static char res[20] = ""; |
114 | CODE *c_pri, *c_fac; | 114 | CODE *c_pri, *c_fac; |
115 | 115 | ||
116 | for (c_fac = facilitynames; | 116 | if (pri != 0) { |
117 | c_fac->c_name && !(c_fac->c_val == LOG_FAC(pri) << 3); c_fac++); | 117 | for (c_fac = facilitynames; |
118 | for (c_pri = prioritynames; | 118 | c_fac->c_name && !(c_fac->c_val == LOG_FAC(pri) << 3); c_fac++); |
119 | c_pri->c_name && !(c_pri->c_val == LOG_PRI(pri)); c_pri++); | 119 | for (c_pri = prioritynames; |
120 | if (*c_fac->c_name == '\0' || *c_pri->c_name == '\0') | 120 | c_pri->c_name && !(c_pri->c_val == LOG_PRI(pri)); c_pri++); |
121 | snprintf(res, sizeof(res), "<%d>", pri); | 121 | if (*c_fac->c_name == '\0' || *c_pri->c_name == '\0') |
122 | else | 122 | snprintf(res, sizeof(res), "<%d>", pri); |
123 | snprintf(res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name); | 123 | else |
124 | snprintf(res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name); | ||
125 | } | ||
124 | 126 | ||
125 | if (strlen(msg) < 16 || msg[3] != ' ' || msg[6] != ' ' || | 127 | if (strlen(msg) < 16 || msg[3] != ' ' || msg[6] != ' ' || |
126 | msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') { | 128 | msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') { |
@@ -141,17 +143,11 @@ static void logMessage(int pri, char *msg) | |||
141 | 143 | ||
142 | static void quit_signal(int sig) | 144 | static void quit_signal(int sig) |
143 | { | 145 | { |
144 | logMessage(LOG_SYSLOG | LOG_INFO, "System log daemon exiting."); | 146 | logMessage(0, "System log daemon exiting."); |
145 | unlink(_PATH_LOG); | 147 | unlink(_PATH_LOG); |
146 | exit(TRUE); | 148 | exit(TRUE); |
147 | } | 149 | } |
148 | 150 | ||
149 | static void restart_signal(int sig) | ||
150 | { | ||
151 | /* pretend to restart */ | ||
152 | logMessage(LOG_SYSLOG | LOG_INFO, "syslogd restarting"); | ||
153 | } | ||
154 | |||
155 | static void domark(int sig) | 151 | static void domark(int sig) |
156 | { | 152 | { |
157 | if (MarkInterval > 0) { | 153 | if (MarkInterval > 0) { |
@@ -173,8 +169,8 @@ static void doSyslogd(void) | |||
173 | signal(SIGINT, quit_signal); | 169 | signal(SIGINT, quit_signal); |
174 | signal(SIGTERM, quit_signal); | 170 | signal(SIGTERM, quit_signal); |
175 | signal(SIGQUIT, quit_signal); | 171 | signal(SIGQUIT, quit_signal); |
176 | signal(SIGHUP, restart_signal); | ||
177 | signal(SIGALRM, domark); | 172 | signal(SIGALRM, domark); |
173 | signal(SIGHUP, SIG_IGN); | ||
178 | alarm(MarkInterval); | 174 | alarm(MarkInterval); |
179 | 175 | ||
180 | /* Remove any preexisting socket/file */ | 176 | /* Remove any preexisting socket/file */ |
@@ -201,8 +197,7 @@ static void doSyslogd(void) | |||
201 | exit(FALSE); | 197 | exit(FALSE); |
202 | } | 198 | } |
203 | 199 | ||
204 | logMessage(LOG_SYSLOG | LOG_INFO, "syslogd started: " | 200 | logMessage(0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")"); |
205 | "BusyBox v" BB_VER " (" BB_BT ")"); | ||
206 | 201 | ||
207 | 202 | ||
208 | while ((conn = accept(fd, (struct sockaddr *) &sunx, | 203 | while ((conn = accept(fd, (struct sockaddr *) &sunx, |
@@ -251,7 +246,7 @@ static void klogd_signal(int sig) | |||
251 | { | 246 | { |
252 | ksyslog(7, NULL, 0); | 247 | ksyslog(7, NULL, 0); |
253 | ksyslog(0, 0, 0); | 248 | ksyslog(0, 0, 0); |
254 | logMessage(LOG_SYSLOG | LOG_INFO, "Kernel log daemon exiting."); | 249 | logMessage(0, "Kernel log daemon exiting."); |
255 | exit(TRUE); | 250 | exit(TRUE); |
256 | } | 251 | } |
257 | 252 | ||
@@ -265,8 +260,8 @@ static void doKlogd(void) | |||
265 | signal(SIGINT, klogd_signal); | 260 | signal(SIGINT, klogd_signal); |
266 | signal(SIGKILL, klogd_signal); | 261 | signal(SIGKILL, klogd_signal); |
267 | signal(SIGTERM, klogd_signal); | 262 | signal(SIGTERM, klogd_signal); |
268 | signal(SIGHUP, klogd_signal); | 263 | signal(SIGHUP, SIG_IGN); |
269 | logMessage(LOG_SYSLOG | LOG_INFO, "klogd started: " | 264 | logMessage(0, "klogd started: " |
270 | "BusyBox v" BB_VER " (" BB_BT ")"); | 265 | "BusyBox v" BB_VER " (" BB_BT ")"); |
271 | 266 | ||
272 | ksyslog(1, NULL, 0); | 267 | ksyslog(1, NULL, 0); |