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/modules/module-detect.c | |
parent | 9c61465c796f3369c7cc57c094489fb383216a1b (diff) | |
parent | 2dc37e1214f20aab528ae680e9a85fc8ea143313 (diff) |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/modules/module-detect.c')
-rw-r--r-- | src/modules/module-detect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c index b1f24e15..1fe8eb8b 100644 --- a/src/modules/module-detect.c +++ b/src/modules/module-detect.c @@ -63,7 +63,7 @@ static int detect_alsa(pa_core *c, int just_one) { FILE *f; int n = 0, n_sink = 0, n_source = 0; - if (!(f = fopen("/proc/asound/devices", "r"))) { + if (!(f = pa_fopen_cloexec("/proc/asound/devices", "r"))) { if (errno != ENOENT) pa_log_error("open(\"/proc/asound/devices\") failed: %s", pa_cstrerror(errno)); @@ -124,9 +124,9 @@ static int detect_oss(pa_core *c, int just_one) { FILE *f; int n = 0, b = 0; - if (!(f = fopen("/dev/sndstat", "r")) && - !(f = fopen("/proc/sndstat", "r")) && - !(f = fopen("/proc/asound/oss/sndstat", "r"))) { + if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) && + !(f = pa_fopen_cloexec("/proc/sndstat", "r")) && + !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) { if (errno != ENOENT) pa_log_error("failed to open OSS sndstat device: %s", pa_cstrerror(errno)); |