Merge branch 'master' of cmatsuoka@helllabs.org:git/eeepc

This commit is contained in:
Claudio Matsuoka committed 2008-05-29 11:13:44 -03:00
commit f516108ca6
1 file changed
+1 -4
+1 -4
View File
@@ -146,7 +146,6 @@ int main()
fd_set rfds; fd_set rfds;
int ctl; int ctl;
struct init_request req; struct init_request req;
struct timespec timeout;
#endif #endif
#ifdef RUNLEVEL #ifdef RUNLEVEL
struct utmp entry; struct utmp entry;
@@ -435,8 +434,6 @@ int main()
#ifdef LISTEN_INITCTL #ifdef LISTEN_INITCTL
mkfifo("/dev/initctl", 0600); mkfifo("/dev/initctl", 0600);
ctl = open("/dev/initctl", O_RDONLY); ctl = open("/dev/initctl", O_RDONLY);
timeout.tv_sec = 0;
timeout.tv_nsec = 100000000;
#endif #endif
while (1) { while (1) {
@@ -450,7 +447,7 @@ int main()
continue; continue;
} }
if (pselect(ctl + 1, &rfds, NULL, NULL, NULL, &nmask) < 0) if (pselect(ctl + 1, &rfds, NULL, NULL, NULL, &nmask) <= 0)
continue; continue;
read(ctl, &req, sizeof (req)); read(ctl, &req, sizeof (req));