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 bf06cc530b168edeff95cbd2cd1928b10e982fda..ef81f298bee17420ec089583caf255c5266b99f2 100644 (file)
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -7,19 +7,14 @@
  * 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
 static const struct option setconsole_long_options[] = {
        { "reset", 0, NULL, 'r' },
        { 0, 0, 0, 0 }
 };
+#endif
 
 #define OPT_SETCONS_RESET 1
 
@@ -28,8 +23,10 @@ int setconsole_main(int argc, char **argv)
        unsigned long flags;
        const char *device = CURRENT_TTY;
 
-       bb_applet_long_options = setconsole_long_options;
-       flags = bb_getopt_ulflags(argc, argv, "r");
+#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
+       applet_long_options = setconsole_long_options;
+#endif
+       flags = getopt32(argc, argv, "r");
 
        if (argc - optind > 1)
                bb_show_usage();
@@ -43,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;