respect CFLAGS/CPPFLAGS in env

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

diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 79a4313f0313a4412c1fa4e2186fcf9f030a6439..ef81f298bee17420ec089583caf255c5266b99f2 100644 (file)
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -7,13 +7,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <getopt.h> /* struct option */
-
 #include "busybox.h"
 
 #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
@@ -31,9 +24,9 @@ int setconsole_main(int argc, char **argv)
        const char *device = CURRENT_TTY;
 
 #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-       bb_applet_long_options = setconsole_long_options;
+       applet_long_options = setconsole_long_options;
 #endif
-       flags = bb_getopt_ulflags(argc, argv, "r");
+       flags = getopt32(argc, argv, "r");
 
        if (argc - optind > 1)
                bb_show_usage();
@@ -47,7 +40,7 @@ int setconsole_main(int argc, char **argv)
                        device = CONSOLE_DEV;
        }
 
-       if (-1 == ioctl(bb_xopen(device, O_RDONLY), TIOCCONS)) {
+       if (-1 == ioctl(xopen(device, O_RDONLY), TIOCCONS)) {
                bb_perror_msg_and_die("TIOCCONS");
        }
        return EXIT_SUCCESS;