--- trunk/mkinitrd-magellan/busybox/console-tools/setlogcons.c 2009/04/24 18:32:46 815 +++ trunk/mkinitrd-magellan/busybox/console-tools/setlogcons.c 2009/04/24 18:33:46 816 @@ -9,23 +9,22 @@ * 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; - } 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 = xatoul_range(argv[1], 0, 63); + 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; }