summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko2006-09-07 06:02:39 +0000
committerDenis Vlasenko2006-09-07 06:02:39 +0000
commit049d6b8c0812b20c024d714a9008cc94713a6175 (patch)
treeaf95f506cc36561eef6204a1bd915bc0467cdc24 /libbb
parentb7d8dd9ab18c5001b5a86127c94a07e3ee0125c7 (diff)
downloadbusybox-049d6b8c0812b20c024d714a9008cc94713a6175.zip
busybox-049d6b8c0812b20c024d714a9008cc94713a6175.tar.gz
Add CONFIG_FEATURE_SYSLOG which controls whether
bb_xx_msg will ever try to send output to syslog. Add "select CONFIG_FEATURE_SYSLOG" to relevant applets. This allows to omit syslog code if we do not have any syslog-capable applets in the build.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/verror_msg.c2
-rw-r--r--libbb/vinfo_msg.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index 237547d..be206e4 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -32,7 +32,7 @@ void bb_verror_msg(const char *s, va_list p, const char* strerr)
else
fprintf(stderr, ": %s\n", strerr);
}
- if (logmode & LOGMODE_SYSLOG) {
+ if (ENABLE_FEATURE_SYSLOG & (logmode & LOGMODE_SYSLOG)) {
if (!strerr)
vsyslog(LOG_ERR, s, p2);
else {
diff --git a/libbb/vinfo_msg.c b/libbb/vinfo_msg.c
index e8776e5..84825bc 100644
--- a/libbb/vinfo_msg.c
+++ b/libbb/vinfo_msg.c
@@ -24,7 +24,7 @@ void bb_vinfo_msg(const char *s, va_list p)
vprintf(s, p);
putchar('\n');
}
- if (logmode & LOGMODE_SYSLOG)
+ if (ENABLE_FEATURE_SYSLOG & (logmode & LOGMODE_SYSLOG))
vsyslog(LOG_INFO, s, p2);
va_end(p2);
}