[git commit] setfiles: switch bb_info_msg to printf

Denys Vlasenko vda.linux at googlemail.com
Wed Mar 30 16:17:35 UTC 2016

commit: https://git.busybox.net/busybox/commit/?id=80f0f1d712fb3ab236e1fc8b37dfa7a9224d7849
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Presumably, bb_info_msg was used here for syslog logging (-l),
but there is no actual code to activate syslog logging.
Added a TODO note on that, so that selinux users would notice
and fix if needed.

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
 selinux/setfiles.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index c974c4a..de99dfe 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -17,6 +17,7 @@
 //usage:	)
 //usage:     "\n	-d	Show which specification matched each file"
 //usage:     "\n	-l	Log changes in file labels to syslog"
+//TODO: log to syslog is not yet implemented, it goes to stdout only now
 //usage:     "\n	-n	Don't change any file labels"
 //usage:     "\n	-q	Suppress warnings"
 //usage:     "\n	-r DIR	Use an alternate root path"
@@ -383,16 +384,16 @@ static int restore(const char *file)
 		 * the user has changed but the role and type are the
 		 * same.  For "-vv", emit everything. */
 		if (verbose > 1 || !user_only_changed) {
-			bb_info_msg("%s: reset %s context %s->%s",
+			printf("%s: reset %s context %s->%s\n",
 				applet_name, my_file, context ? context : "", newcon);
 	if (FLAG_l_take_log && !user_only_changed) {
 		if (context)
-			bb_info_msg("relabeling %s from %s to %s", my_file, context, newcon);
+			printf("relabeling %s from %s to %s\n", my_file, context, newcon);
-			bb_info_msg("labeling %s to %s", my_file, newcon);
+			printf("labeling %s to %s\n", my_file, newcon);
 	if (outfile && !user_only_changed)

More information about the busybox-cvs mailing list