projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tac: *really* add tac.c now
[oweals/busybox.git]
/
console-tools
/
setconsole.c
diff --git
a/console-tools/setconsole.c
b/console-tools/setconsole.c
index 79a4313f0313a4412c1fa4e2186fcf9f030a6439..0aa1d3a3525f6bdc902277714baa28aec6ec8730 100644
(file)
--- a/
console-tools/setconsole.c
+++ b/
console-tools/setconsole.c
@@
-7,33
+7,27
@@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
* 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"
+#include <getopt.h>
+#include "libbb.h"
#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
#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
#endif
#define OPT_SETCONS_RESET 1
+int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int setconsole_main(int argc, char **argv)
{
unsigned long flags;
const char *device = CURRENT_TTY;
#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
int setconsole_main(int argc, char **argv)
{
unsigned long flags;
const char *device = CURRENT_TTY;
#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-
bb_applet_long_options = setconsole_long_option
s;
+
applet_long_options = setconsole_longopt
s;
#endif
#endif
- flags =
bb_getopt_ulflags(argc,
argv, "r");
+ flags =
getopt32(
argv, "r");
if (argc - optind > 1)
bb_show_usage();
if (argc - optind > 1)
bb_show_usage();
@@
-44,11
+38,9
@@
int setconsole_main(int argc, char **argv)
device = argv[optind];
} else {
if (flags & OPT_SETCONS_RESET)
device = argv[optind];
} 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;
}
return EXIT_SUCCESS;
}