tcpudp: trivial build fix

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

diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 53ff1ad1edc5328b859b22aaffebcfa801f87e55..8765a7c2edc4ef1c97df6927dbed1380a3d196e7 100644 (file)
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -4,45 +4,29 @@
  *
  *  Copyright (C) 2004,2005  Enrik Berkhan <Enrik.Berkhan@inka.de>
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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>
+#include "libbb.h"
 
-#include "busybox.h"
-
-static const struct option setconsole_long_options[] = {
-       { "reset", 0, NULL, 'r' },
-       { 0, 0, 0, 0 }
-};
+#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
+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)
 {
-       int con;
        unsigned long flags;
-       const char *device = "/dev/tty";
+       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_longopts;
+#endif
+       flags = getopt32(argv, "r");
 
        if (argc - optind > 1)
                bb_show_usage();
@@ -53,22 +37,9 @@ int setconsole_main(int argc, char **argv)
                device = argv[optind];
        } else {
                if (flags & OPT_SETCONS_RESET)
-                       device = "/dev/console";
+                       device = DEV_CONSOLE;
        }
 
-       if (-1 == (con = open(device, O_RDONLY))) {
-               bb_perror_msg_and_die("open %s", device);
-       }
-       if (-1 == ioctl(con, TIOCCONS)) {
-               bb_perror_msg_and_die("ioctl TIOCCONS");
-       }
+       xioctl(xopen(device, O_RDONLY), TIOCCONS, NULL);
        return EXIT_SUCCESS;
 }
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/