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

Fix the EINTR check for waitpid, Gentoo #219929.

Browse Source
This commit is contained in:
Roy Marples 2008-05-06 21:53:21 +00:00
parent c8248d05a0
commit 619b0b4f37
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/rc/rc-plugin.c
View File

@ -120,18 +120,25 @@ void rc_plugin_load(void)
int rc_waitpid(pid_t pid) int rc_waitpid(pid_t pid)
{ {
int status = 0; int status;
pid_t savedpid = pid; pid_t savedpid = pid;
int retval = EXIT_FAILURE;
do { loop:
pid = waitpid(savedpid, &status, 0); pid = waitpid(savedpid, &status, 0);
if (pid == -1 && errno != EINTR) if (pid == -1) {
return EXIT_FAILURE; /* Our signal hander should take appropriate action. */
} while (!WIFEXITED(status) && !WIFSIGNALED(status)); if (errno == EINTR)
if (pid == savedpid) goto loop;
retval = WIFEXITED(status) ? WEXITSTATUS(status) : EXIT_FAILURE; return EXIT_FAILURE;
return retval; }
if (pid == savedpid) {
if (WIFEXITED(status))
return WEXITSTATUS(status);
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
} }
void rc_plugin_run(RC_HOOK hook, const char *value) void rc_plugin_run(RC_HOOK hook, const char *value)

7
src/rc/rc.c
View File

@ -635,13 +635,6 @@ static void do_newlevel(const char *newlevel)
{ {
/* OK, we're either in runlevel 1 or single user mode */ /* OK, we're either in runlevel 1 or single user mode */
/* We don't want to trap SIGWINCH here as when a framebuffer
* driver is loaded by udev and we start using it then we
* race for some reason with the below scripts.
* This is fine as we only really need SIGWINCH for tidy
* output when using the logger. */
signal_setup(SIGWINCH, SIG_DFL);
/* exec init-early.sh if it exists /* exec init-early.sh if it exists
* This should just setup the console to use the correct * This should just setup the console to use the correct
* font. Maybe it should setup the keyboard too? */ * font. Maybe it should setup the keyboard too? */