ash: do not let EXIT trap to fire in `trap`

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

diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 79a4313f0313a4412c1fa4e2186fcf9f030a6439..8ad9948dd5a90b53c4bb10f6f486ddb3bc97f6c7 100644 (file)
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -3,52 +3,37 @@
  *  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.
  */
 
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <getopt.h> /* struct option */
+#include "libbb.h"
 
-#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
-
-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
-       bb_applet_long_options = setconsole_long_options;
+       static const char setconsole_longopts[] ALIGN1 =
+               "reset\0" No_argument "r"
+               ;
+       applet_long_options = setconsole_longopts;
 #endif
-       flags = bb_getopt_ulflags(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)
-                       device = CONSOLE_DEV;
+               if (reset)
+                       device = DEV_CONSOLE;
        }
 
-       if (-1 == ioctl(bb_xopen(device, O_RDONLY), TIOCCONS)) {
-               bb_perror_msg_and_die("TIOCCONS");
-       }
+       xioctl(xopen(device, O_RDONLY), TIOCCONS, NULL);
        return EXIT_SUCCESS;
 }