Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/console-tools/setconsole.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/console-tools/setconsole.c (modified) (3 diffs)

branches/2.2.5/mindi-busybox/console-tools/setconsole.c

@@ -8 +8 @@
  */
 
-#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"
+#include <getopt.h>
+#include "libbb.h"
 
 #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-static const struct option setconsole_long_options[] = {
-    { "reset", 0, NULL, 'r' },
-    { 0, 0, 0, 0 }
-};
+static const char setconsole_longopts[] ALIGN1 =
+    "reset\0" No_argument "r"
+    ;
 #endif
 
 #define OPT_SETCONS_RESET 1
 
+int setconsole_main(int argc, char **argv);
 int setconsole_main(int argc, char **argv)
 {
@@ -32 +26 @@
 
 #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-    bb_applet_long_options = setconsole_long_options;
+    applet_long_options = setconsole_longopts;
 #endif
-    flags = bb_getopt_ulflags(argc, argv, "r");
+    flags = getopt32(argv, "r");
 
     if (argc - optind > 1)
@@ -45 +39 @@
     } else {
         if (flags & OPT_SETCONS_RESET)
-            device = CONSOLE_DEV;
+            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;
 }