diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-10-31 02:16:14 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-10-31 02:16:14 +0100 |
| commit | c4e276edbd84cbb8c5b594c9f427b0a25a7fb2ab (patch) | |
| tree | 55c0d0f8e378e5e6fe203b250a816ea4d2d75ccb /src/pulsecore/pid.c | |
| parent | 9c61465c796f3369c7cc57c094489fb383216a1b (diff) | |
| parent | 2dc37e1214f20aab528ae680e9a85fc8ea143313 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/pulsecore/pid.c')
| -rw-r--r-- | src/pulsecore/pid.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/pulsecore/pid.c b/src/pulsecore/pid.c index 996946c2..213e7983 100644 --- a/src/pulsecore/pid.c +++ b/src/pulsecore/pid.c @@ -88,10 +88,7 @@ static int open_pid_file(const char *fn, int mode) { for (;;) { struct stat st; - if ((fd = open(fn, mode -#ifdef O_NOCTTY - |O_NOCTTY -#endif + if ((fd = pa_open_cloexec(fn, mode #ifdef O_NOFOLLOW |O_NOFOLLOW #endif @@ -146,7 +143,7 @@ static int proc_name_ours(pid_t pid, const char *procname) { pa_snprintf(bn, sizeof(bn), "/proc/%lu/stat", (unsigned long) pid); - if (!(f = fopen(bn, "r"))) { + if (!(f = pa_fopen_cloexec(bn, "r"))) { pa_log_info("Failed to open %s: %s", bn, pa_cstrerror(errno)); return -1; } else { |