projects
/
profile
/
ivi
/
pulseaudio-panda.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce3fbb5
)
core-util: fall back to sysconf(_SC_OPEN_MAX) to find maximum file descriptor
author
Lennart Poettering
<lennart@poettering.net>
Thu, 21 May 2009 23:31:56 +0000
(
01:31
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 21 May 2009 23:31:56 +0000
(
01:31
+0200)
src/pulsecore/core-util.c
patch
|
blob
|
history
diff --git
a/src/pulsecore/core-util.c
b/src/pulsecore/core-util.c
index
4658eb5
..
d4956fb
100644
(file)
--- a/
src/pulsecore/core-util.c
+++ b/
src/pulsecore/core-util.c
@@
-2235,7
+2235,7
@@
int pa_close_all(int except_fd, ...) {
int pa_close_allv(const int except_fds[]) {
struct rlimit rl;
- int fd;
+ int
maxfd,
fd;
int saved_errno;
#ifdef __linux__
@@
-2302,10
+2302,12
@@
int pa_close_allv(const int except_fds[]) {
#endif
- if (getrlimit(RLIMIT_NOFILE, &rl) < 0)
- return -1;
+ if (getrlimit(RLIMIT_NOFILE, &rl) >= 0)
+ maxfd = (int) rl.rlim_max;
+ else
+ maxfd = sysconf(_SC_OPEN_MAX);
- for (fd = 3; fd <
(int) rl.rlim_max
; fd++) {
+ for (fd = 3; fd <
maxfd
; fd++) {
int i;
pa_bool_t found;