ls: handle -i through option_mask32

[oweals/busybox.git] / console-tools / setlogcons.c

diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c
index 7b5addca7816931af96f3ec61c5eddc2397c1914..2ea36f0397c1f3df51ff431e59675fc1d84203ba 100644 (file)
--- a/console-tools/setlogcons.c
+++ b/console-tools/setlogcons.c
@@ -6,27 +6,41 @@
  *
  * Based on setlogcons (kbd-1.12) by Andries E. Brouwer
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config SETLOGCONS
+//config:      bool "setlogcons"
+//config:      default y
+//config:      select PLATFORM_LINUX
+//config:      help
+//config:        This program redirects the output console of kernel messages.
 
-#include "busybox.h"
+//applet:IF_SETLOGCONS(APPLET(setlogcons, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
-int setlogcons_main(int argc, char **argv);
-int setlogcons_main(int argc, char **argv)
+//kbuild:lib-$(CONFIG_SETLOGCONS) += setlogcons.o
+
+//usage:#define setlogcons_trivial_usage
+//usage:       "[N]"
+//usage:#define setlogcons_full_usage "\n\n"
+//usage:       "Redirect the kernel output to console N. Default:0 (current console)"
+
+#include "libbb.h"
+
+int setlogcons_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setlogcons_main(int argc UNUSED_PARAM, char **argv)
 {
        struct {
                char fn;
                char subarg;
-       } arg;
-
-       arg.fn = 11;    /* redirect kernel messages */
-       arg.subarg = 0; /* to specified console (current as default) */
+       } arg = {
+               11, /* redirect kernel messages */
+               0   /* to specified console (current as default) */
+       };
 
-       if (argc == 2)
-               arg.subarg = xatoul_range(argv[1], 0, 63);
+       if (argv[1])
+               arg.subarg = xatou_range(argv[1], 0, 63);
 
-       if (ioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg))
-               bb_perror_msg_and_die("TIOCLINUX");
+       xioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg);
 
-       return 0;
+       return EXIT_SUCCESS;
 }