mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify pa_start_child_for_read by using pa_close_all()/pa_reset_sigs()/pa_unblock_sigs()

Browse source
This commit is contained in:
Lennart Poettering 2008-08-19 22:49:14 +02:00
parent b7026bf248
commit 961aa185e3
1 changed files with 3 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/pulsecore/start-child.c
View file

@ -66,11 +66,6 @@ int pa_start_child_for_read(const char *name, const char *argv1, pid_t *pid) {
return pipe_fds[0]; return pipe_fds[0];
} else { } else {
#ifdef __linux__
DIR* d;
#endif
int max_fd, i;
/* child */ /* child */
pa_reset_priority(); pa_reset_priority();
@ -87,48 +82,9 @@ int pa_start_child_for_read(const char *name, const char *argv1, pid_t *pid) {
pa_close(2); pa_close(2);
pa_assert_se(open("/dev/null", O_WRONLY) == 2); pa_assert_se(open("/dev/null", O_WRONLY) == 2);
#ifdef __linux__ pa_close_all(-1);
pa_reset_sigs(-1);
if ((d = opendir("/proc/self/fd/"))) { pa_unblock_sigs(-1);
struct dirent *de;
while ((de = readdir(d))) {
char *e = NULL;
int fd;
if (de->d_name[0] == '.')
continue;
errno = 0;
fd = strtol(de->d_name, &e, 10);
pa_assert(errno == 0 && e && *e == 0);
if (fd >= 3 && dirfd(d) != fd)
pa_close(fd);
}
closedir(d);
} else {
#endif
max_fd = 1024;
#ifdef HAVE_SYS_RESOURCE_H
{
struct rlimit r;
if (getrlimit(RLIMIT_NOFILE, &r) == 0)
max_fd = r.rlim_max;
}
#endif
for (i = 3; i < max_fd; i++)
pa_close(i);
#ifdef __linux__
}
#endif
#ifdef PR_SET_PDEATHSIG #ifdef PR_SET_PDEATHSIG
/* On Linux we can use PR_SET_PDEATHSIG to have the helper /* On Linux we can use PR_SET_PDEATHSIG to have the helper
@ -139,16 +95,6 @@ int pa_start_child_for_read(const char *name, const char *argv1, pid_t *pid) {
prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0); prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
#endif #endif
#ifdef SIGPIPE
/* Make sure that SIGPIPE kills the child process */
signal(SIGPIPE, SIG_DFL);
#endif
#ifdef SIGTERM
/* Make sure that SIGTERM kills the child process */
signal(SIGTERM, SIG_DFL);
#endif
execl(name, name, argv1, NULL); execl(name, name, argv1, NULL);
_exit(1); _exit(1);
} }