libbb: make syslog level for bb_error_msg's configurable. use it in crond

function                                             old     new   delta
bb_verror_msg                                        380     386      +6
syslog_level                                           -       1      +1
crondlog                                             165     108     -57

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 8 insertions, 15 deletions

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 995ed9e..8441b6c 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -163,28 +163,21 @@ static void crondlog(const char *ctl, ...) __attribute__ ((format (printf, 1, 2)
 static void crondlog(const char *ctl, ...)
 {
 	va_list va;
-	int level = (ctl[0] & 0x1f);
+	unsigned level = (ctl[0] & 0x1f);
 
 	va_start(va, ctl);
-	if (level >= (int)G.log_level) {
-		/* Debug mode: all to (non-redirected) stderr, */
-		/* Syslog mode: all to syslog (logmode = LOGMODE_SYSLOG), */
-		if (!DebugOpt && G.log_filename) {
-			/* Otherwise (log to file): we reopen log file at every write: */
+	if (level >= G.log_level) {
+		if (G.log_filename) {
+			/* If log to file, reopen log file at every write: */
 			int logfd = open_or_warn(G.log_filename, O_WRONLY | O_CREAT | O_APPEND);
 			if (logfd >= 0)
 				xmove_fd(logfd, STDERR_FILENO);
 		}
 		/* When we log to syslog, level > 8 is logged at LOG_ERR
-		 * syslog level, level <= 8 is logged at LOG_INFO. */
-		if (level > 8) {
-			bb_verror_msg(ctl + 1, va, /* strerr: */ NULL);
-		} else {
-			char *msg = NULL;
-			vasprintf(&msg, ctl + 1, va);
-			bb_info_msg("%s: %s", applet_name, msg);
-			free(msg);
-		}
+		 * syslog level, level <= 8 is logged at LOG_INFO.
+		 */
+		syslog_level = (level > 8) ? LOG_ERR : LOG_INFO;
+		bb_verror_msg(ctl + 1, va, /* strerr: */ NULL);
 	}
 	va_end(va);
 	if (ctl[0] & 0x80)