emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes atop syslog config patch

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2011-04-16 20:15:14 +02:00
parent 89b3cbaa97
commit 0288b27ad8
4 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysklogd/Config.src
View File

@@ -57,7 +57,7 @@ config FEATURE_SYSLOGD_CFG
default y
depends on SYSLOGD
help
Supports restricted syslogd config.
Supports restricted syslogd config. See docs/syslog.conf.txt
config FEATURE_SYSLOGD_READ_BUFFER_SIZE
int "Read buffer size in bytes"

12
sysklogd/syslogd.c
View File

@@ -33,6 +33,8 @@
//usage: "\n -D Drop duplicates")
//usage: IF_FEATURE_IPC_SYSLOG(
//usage: "\n -C[size(KiB)] Log to shared mem buffer (read it using logread)")
//usage: IF_FEATURE_SYSLOGD_CFG(
//usage: "\n -f FILE Use FILE as config (default is /etc/syslog.conf)")
/* NB: -Csize shouldn't have space (because size is optional) */
/* //usage: "\n -m MIN Minutes between MARK lines (default:20, 0=off)" */
//usage:
@@ -284,10 +286,8 @@ static void parse_syslogdcfg(const char *file)
logRule_t *cur_rule;
/* unexpected trailing token? */
if (tok[2]) {
t = tok[2];
if (tok[2])
goto cfgerr;
}
cur_rule = *pp_rule = xzalloc(sizeof(*cur_rule));
@@ -307,10 +307,8 @@ static void parse_syslogdcfg(const char *file)
*next_selector++ = '\0';
t = strchr(cur_selector, '.');
if (!t) {
t = cur_selector;
if (!t)
goto cfgerr;
}
*t++ = '\0'; /* separate facility from priority */
negated_prio = 0;
@@ -414,7 +412,7 @@ static void parse_syslogdcfg(const char *file)
return;
cfgerr:
bb_error_msg_and_die("bad line %d: wrong token '%s'", parser->lineno, t);
bb_error_msg_and_die("error in '%s' at line %d", file, parser->lineno);
}
#endif