From 253c4e787a799a3e1f92957ed791b5222f8d2f64 Mon Sep 17 00:00:00 2001 From: James Byrne Date: Fri, 12 Apr 2019 17:01:51 +0000 Subject: Optionally re-introduce bb_info_msg() Between Busybox 1.24.2 and 1.25.0 the bb_info_msg() function was eliminated and calls to it changed to be bb_error_msg(). The downside of this is that daemons now log all messages to syslog at the LOG_ERR level which makes it hard to filter errors from informational messages. This change optionally re-introduces bb_info_msg(), controlled by a new option FEATURE_SYSLOG_INFO, restores all the calls to bb_info_msg() that were removed (only in applets that set logmode to LOGMODE_SYSLOG or LOGMODE_BOTH), and also changes informational messages in ifplugd and ntpd. The code size change of this is as follows (using 'defconfig' on x86_64 with gcc 7.3.0-27ubuntu1~18.04) function old new delta bb_info_msg - 182 +182 bb_vinfo_msg - 27 +27 static.log7 194 198 +4 log8 190 191 +1 log5 190 191 +1 crondlog 45 - -45 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 3/0 up/down: 215/-45) Total: 170 bytes If you don't care about everything being logged at LOG_ERR level then when FEATURE_SYSLOG_INFO is disabled Busybox actually gets smaller: function old new delta static.log7 194 200 +6 log8 190 193 +3 log5 190 193 +3 syslog_level 1 - -1 bb_verror_msg 583 581 -2 crondlog 45 - -45 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 3/1 up/down: 12/-48) Total: -36 bytes Signed-off-by: James Byrne Signed-off-by: Denys Vlasenko --- networking/zcip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'networking/zcip.c') diff --git a/networking/zcip.c b/networking/zcip.c index 434762f12..f95b6f7fb 100644 --- a/networking/zcip.c +++ b/networking/zcip.c @@ -195,7 +195,7 @@ static int run(char *argv[3], const char *param, uint32_t nip) putenv(env_ip); fmt -= 3; } - bb_error_msg(fmt, argv[2], argv[0], addr); + bb_info_msg(fmt, argv[2], argv[0], addr); status = spawn_and_wait(argv + 1); if (nip != 0) bb_unsetenv_and_free(env_ip); @@ -339,7 +339,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv) #if BB_MMU bb_daemonize(0 /*was: DAEMON_CHDIR_ROOT*/); #endif - bb_error_msg("start, interface %s", argv_intf); + bb_info_msg("start, interface %s", argv_intf); } // Run the dynamic address negotiation protocol, -- cgit v1.2.3