emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2005-07-04 Shaun Jackman <sjackman@gmail.com>

Browse Source 
* init/init.c: Do not include sys/mount.h.
        (message): Use O_NONBLOCK instead of O_NDELAY.
        (console_init): Ditto.
This commit is contained in:
Mike Frysinger 2005-07-06 04:46:14 +00:00
parent 95ef16528c
commit e548bdff96
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
init/init.c
View File

@ -39,7 +39,6 @@
#include <limits.h> #include <limits.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mount.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/reboot.h> #include <sys/reboot.h>
@ -239,7 +238,7 @@ static void message(int device, const char *fmt, ...)
/* Take full control of the log tty, and never close it. /* Take full control of the log tty, and never close it.
* It's mine, all mine! Muhahahaha! */ * It's mine, all mine! Muhahahaha! */
if (log_fd < 0) { 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; log_fd = -2;
bb_error_msg("Bummer, can't write to log on %s!", log_console); bb_error_msg("Bummer, can't write to log on %s!", log_console);
device = CONSOLE; device = CONSOLE;
@ -254,7 +253,7 @@ static void message(int device, const char *fmt, ...)
if (device & CONSOLE) { if (device & CONSOLE) {
int fd = device_open(_PATH_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. */ /* Always send console messages to /dev/console so people will see them. */
if (fd >= 0) { if (fd >= 0) {
bb_full_write(fd, msg, l); bb_full_write(fd, msg, l);