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

OK, we have to use fork with sigprocmask as not all systems provide a working and sane kernel call to bypass libc.

Browse Source
This commit is contained in:
Roy Marples 2008-02-02 14:22:37 +00:00
parent 8830b50636
commit 7b27a12f6c
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/librc/librc.c
View File

@ -32,7 +32,6 @@
const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples"; const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
#include "librc.h" #include "librc.h"
#include <sys/syscall.h>
#include <signal.h> #include <signal.h>
#define SOFTLEVEL RC_SVCDIR "/softlevel" #define SOFTLEVEL RC_SVCDIR "/softlevel"
@ -41,23 +40,6 @@ const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
#endif #endif
/* Some platforms don't expose SYS_sigaction and friends.
* So we hope that their libc does the Right Thing. */
#ifdef SYS_sigaction
# define do_sigaction(_sig, _new, _old) \
syscall (SYS_sigaction, _sig, _new, _old);
#else
#define do_sigaction(_sig, _new, _old) \
sigaction (_sig, _new, _old)
#endif
#ifdef SYS_sigprocmask
# define do_sigprocmask(_sig, _new, _old) \
syscall (SYS_sigprocmask, _sig, _new, _old);
#else
#define do_sigprocmask(_sig, _new, _old) \
sigprocmask (_sig, _new, _old)
#endif
/* File stream used for plugins to write environ vars to */ /* File stream used for plugins to write environ vars to */
FILE *rc_environ_fd = NULL; FILE *rc_environ_fd = NULL;
@ -623,18 +605,19 @@ static pid_t _exec_service (const char *service, const char *arg)
sigemptyset (&empty); sigemptyset (&empty);
sigfillset (&full); sigfillset (&full);
sigprocmask (SIG_SETMASK, &full, &old); sigprocmask (SIG_SETMASK, &full, &old);
if ((pid = vfork ()) == 0) {
if ((pid = fork ()) == 0) {
/* Restore default handlers */ /* Restore default handlers */
do_sigaction (SIGCHLD, &sa, NULL); sigaction (SIGCHLD, &sa, NULL);
do_sigaction (SIGHUP, &sa, NULL); sigaction (SIGHUP, &sa, NULL);
do_sigaction (SIGINT, &sa, NULL); sigaction (SIGINT, &sa, NULL);
do_sigaction (SIGQUIT, &sa, NULL); sigaction (SIGQUIT, &sa, NULL);
do_sigaction (SIGTERM, &sa, NULL); sigaction (SIGTERM, &sa, NULL);
do_sigaction (SIGUSR1, &sa, NULL); sigaction (SIGUSR1, &sa, NULL);
do_sigaction (SIGWINCH, &sa, NULL); sigaction (SIGWINCH, &sa, NULL);
/* Unmask signals */ /* Unmask signals */
do_sigprocmask (SIG_SETMASK, &empty, NULL); sigprocmask (SIG_SETMASK, &empty, NULL);
/* Safe to run now */ /* Safe to run now */
execl (file, file, arg, (char *) NULL); execl (file, file, arg, (char *) NULL);