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

Create a function for running init.sh and init-early.sh which saves on code and removes a gcc-4.2 warning

Browse Source
This commit is contained in:
Roy Marples 2007-05-22 12:25:43 +00:00
parent 49347d6f77
commit 64e6dcfc9f
1 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/rc.c
View File

@ -577,6 +577,29 @@ static void handle_signal (int sig)
errno = serrno; errno = serrno;
} }
static void run_script (const char *script) {
int status = 0;
pid_t pid = vfork ();
if (pid < 0)
eerrorx ("%s: vfork: %s", applet, strerror (errno));
else if (pid == 0) {
execl (script, script, (char *) NULL);
eerror ("%s: unable to exec `%s': %s",
script, applet, strerror (errno));
_exit (EXIT_FAILURE);
}
do {
pid_t wpid = waitpid (pid, &status, 0);
if (wpid < 1)
eerror ("waitpid: %s", strerror (errno));
} while (! WIFEXITED (status) && ! WIFSIGNALED (status));
if (! WIFEXITED (status) || ! WEXITSTATUS (status) == 0)
exit (EXIT_FAILURE);
}
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
char *RUNLEVEL = NULL; char *RUNLEVEL = NULL;
@ -707,9 +730,6 @@ int main (int argc, char **argv)
/* OK, we're either in runlevel 1 or single user mode */ /* OK, we're either in runlevel 1 or single user mode */
if (strcmp (newlevel, RC_LEVEL_SYSINIT) == 0) { if (strcmp (newlevel, RC_LEVEL_SYSINIT) == 0) {
struct utsname uts; struct utsname uts;
pid_t pid;
pid_t wpid;
int status = 0;
#ifdef __linux__ #ifdef __linux__
FILE *fp; FILE *fp;
#endif #endif
@ -717,23 +737,8 @@ int main (int argc, char **argv)
/* 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? */
if (rc_exists (INITEARLYSH)) { if (rc_exists (INITEARLYSH))
if ((pid = vfork ()) == -1) run_script (INITEARLYSH);
eerrorx ("%s: vfork: %s", applet, strerror (errno));
if (pid == 0) {
execl (INITEARLYSH, INITEARLYSH, (char *) NULL);
eerror ("%s: unable to exec `" INITEARLYSH "': %s",
applet, strerror (errno));
_exit (EXIT_FAILURE);
}
do {
wpid = waitpid (pid, &status, 0);
if (wpid < 1)
eerror ("waitpid: %s", strerror (errno));
} while (! WIFEXITED (status) && ! WIFSIGNALED (status));
}
uname (&uts); uname (&uts);
@ -750,25 +755,7 @@ int main (int argc, char **argv)
setenv ("RC_SOFTLEVEL", newlevel, 1); setenv ("RC_SOFTLEVEL", newlevel, 1);
rc_plugin_run (rc_hook_runlevel_start_in, newlevel); rc_plugin_run (rc_hook_runlevel_start_in, newlevel);
run_script (INITSH);
if ((pid = vfork ()) == -1)
eerrorx ("%s: vfork: %s", applet, strerror (errno));
if (pid == 0) {
execl (INITSH, INITSH, (char *) NULL);
eerror ("%s: unable to exec `" INITSH "': %s",
applet, strerror (errno));
_exit (EXIT_FAILURE);
}
do {
wpid = waitpid (pid, &status, 0);
if (wpid < 1)
eerror ("waitpid: %s", strerror (errno));
} while (! WIFEXITED (status) && ! WIFSIGNALED (status));
if (! WIFEXITED (status) || ! WEXITSTATUS (status) == 0)
exit (EXIT_FAILURE);
/* If we requested a softlevel, save it now */ /* If we requested a softlevel, save it now */
#ifdef __linux__ #ifdef __linux__