From e548bdff969aeaeac084c351dc375d37e918f634 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 6 Jul 2005 04:46:14 +0000 Subject: 2005-07-04 Shaun Jackman * init/init.c: Do not include sys/mount.h. (message): Use O_NONBLOCK instead of O_NDELAY. (console_init): Ditto. --- init/init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'init') diff --git a/init/init.c b/init/init.c index 528122580..95d7253ea 100644 --- a/init/init.c +++ b/init/init.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -239,7 +238,7 @@ static void message(int device, const char *fmt, ...) /* Take full control of the log tty, and never close it. * It's mine, all mine! Muhahahaha! */ if (log_fd < 0) { - if ((log_fd = device_open(log_console, O_RDWR | O_NDELAY | O_NOCTTY)) < 0) { + if ((log_fd = device_open(log_console, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) { log_fd = -2; bb_error_msg("Bummer, can't write to log on %s!", log_console); device = CONSOLE; @@ -254,7 +253,7 @@ static void message(int device, const char *fmt, ...) if (device & CONSOLE) { int fd = device_open(_PATH_CONSOLE, - O_WRONLY | O_NOCTTY | O_NDELAY); + O_WRONLY | O_NOCTTY | O_NONBLOCK); /* Always send console messages to /dev/console so people will see them. */ if (fd >= 0) { bb_full_write(fd, msg, l); -- cgit v1.2.3