tac: *really* add tac.c now

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

diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index ef81f298bee17420ec089583caf255c5266b99f2..0aa1d3a3525f6bdc902277714baa28aec6ec8730 100644 (file)
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -7,26 +7,27 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include <getopt.h>
+#include "libbb.h"
 
 #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-static const struct option setconsole_long_options[] = {
-       { "reset", 0, NULL, 'r' },
-       { 0, 0, 0, 0 }
-};
+static const char setconsole_longopts[] ALIGN1 =
+       "reset\0" No_argument "r"
+       ;
 #endif
 
 #define OPT_SETCONS_RESET 1
 
+int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int setconsole_main(int argc, char **argv)
 {
        unsigned long flags;
        const char *device = CURRENT_TTY;
 
 #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-       applet_long_options = setconsole_long_options;
+       applet_long_options = setconsole_longopts;
 #endif
-       flags = getopt32(argc, argv, "r");
+       flags = getopt32(argv, "r");
 
        if (argc - optind > 1)
                bb_show_usage();
@@ -37,11 +38,9 @@ int setconsole_main(int argc, char **argv)
                device = argv[optind];
        } else {
                if (flags & OPT_SETCONS_RESET)
-                       device = CONSOLE_DEV;
+                       device = DEV_CONSOLE;
        }
 
-       if (-1 == ioctl(xopen(device, O_RDONLY), TIOCCONS)) {
-               bb_perror_msg_and_die("TIOCCONS");
-       }
+       xioctl(xopen(device, O_RDONLY), TIOCCONS, NULL);
        return EXIT_SUCCESS;
 }