projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init: O_NONBLOCK needs more thought. reverted for now
[oweals/busybox.git]
/
console-tools
/
setlogcons.c
diff --git
a/console-tools/setlogcons.c
b/console-tools/setlogcons.c
index 6667eb622574adad9967a9e5c63af09fe650d5c6..dd44591a33c5a1ae8a9c97ae2fdbc0b349c0310a 100644
(file)
--- a/
console-tools/setlogcons.c
+++ b/
console-tools/setlogcons.c
@@
-1,6
+1,6
@@
/* vi: set sw=4 ts=4: */
/*
/* vi: set sw=4 ts=4: */
/*
- * setlogcons: Send kernel messages to the current console or to console N
+ * setlogcons: Send kernel messages to the current console or to console N
*
* Copyright (C) 2006 by Jan Kiszka <jan.kiszka@web.de>
*
*
* Copyright (C) 2006 by Jan Kiszka <jan.kiszka@web.de>
*
@@
-9,23
+9,22
@@
* 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 "
busybox
.h"
+#include "
libbb
.h"
-extern int setlogcons_main(int argc, char **argv)
+int setlogcons_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setlogcons_main(int argc UNUSED_PARAM, char **argv)
{
struct {
char fn;
char subarg;
{
struct {
char fn;
char subarg;
- } arg;
+ } arg = { 11, /* redirect kernel messages */
+ 0 /* to specified console (current as default) */
+ };
- arg.fn = 11; /* redirect kernel messages */
- arg.subarg = 0; /* to specified console (current as default) */
+ if (argv[1])
+ arg.subarg = xatou_range(argv[1], 0, 63);
- if (argc == 2)
- arg.subarg = atoi(argv[1]);
+ xioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg);
- if (ioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg))
- bb_perror_msg_and_die("TIOCLINUX");;
-
- return 0;
+ return EXIT_SUCCESS;
}
}