find:: get rid of nested function (it's a gcc-ism)

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

diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 2e60c375e0e136d2fdb3479bab187bd54b2d03cd..c0051dcc8c1d2a0f64e484bac80a726e5cd172b4 100644 (file)
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -3,44 +3,43 @@
  *  setconsole.c - redirect system console output
  *
  *  Copyright (C) 2004,2005  Enrik Berkhan <Enrik.Berkhan@inka.de>
+ *  Copyright (C) 2008 Bernhard Reutner-Fischer
  *
- * 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.
  */
 
-#include <getopt.h>
-#include "libbb.h"
-
-#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-static const char setconsole_longopts[] =
-       "reset\0" No_argument "r"
-       "\0";
-#endif
+//usage:#define setconsole_trivial_usage
+//usage:       "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
+//usage:#define setconsole_full_usage "\n\n"
+//usage:       "Redirect system console output to DEVICE (default: /dev/tty)\n"
+//usage:     "\n       -r      Reset output to /dev/console"
 
-#define OPT_SETCONS_RESET 1
+#include "libbb.h"
 
-int setconsole_main(int argc, char **argv);
-int setconsole_main(int argc, char **argv)
+int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setconsole_main(int argc UNUSED_PARAM, char **argv)
 {
-       unsigned long flags;
        const char *device = CURRENT_TTY;
+       bool reset;
 
 #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
+       static const char setconsole_longopts[] ALIGN1 =
+               "reset\0" No_argument "r"
+               ;
        applet_long_options = setconsole_longopts;
 #endif
-       flags = getopt32(argc, argv, "r");
-
-       if (argc - optind > 1)
-               bb_show_usage();
+       /* at most one non-option argument */
+       opt_complementary = "?1";
+       reset = getopt32(argv, "r");
 
-       if (argc - optind == 1) {
-               if (flags & OPT_SETCONS_RESET)
-                       bb_show_usage();
-               device = argv[optind];
+       argv += 1 + reset;
+       if (*argv) {
+               device = *argv;
        } else {
-               if (flags & OPT_SETCONS_RESET)
+               if (reset)
                        device = DEV_CONSOLE;
        }
 
-       xioctl(xopen(device, O_RDONLY), TIOCCONS, NULL);
+       xioctl(xopen(device, O_WRONLY), TIOCCONS, NULL);
        return EXIT_SUCCESS;
 }