diff options
| author | Gregory P. Smith <greg@krypto.org> | 2015-04-26 06:43:34 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2015-04-26 06:43:34 (GMT) |
| commit | f9681776c97757540200b6a0261c89c57c94f580 (patch) | |
| tree | c1ec630a4beb7f11435f297dce9cf7d6b50404dc | |
| parent | d87dd434c02024a3ea34a21486125929159927e7 (diff) | |
| download | cpython-f9681776c97757540200b6a0261c89c57c94f580.zip cpython-f9681776c97757540200b6a0261c89c57c94f580.tar.gz cpython-f9681776c97757540200b6a0261c89c57c94f580.tar.bz2 | |
Fix computation of max_fd on OpenBSD. Issue #23852.
| -rw-r--r-- | Modules/_posixsubprocess.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c index f0a272e..452d592 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -14,6 +14,9 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif +#if defined(HAVE_SYS_RESOURCE_H) +#include <sys/resource.h> +#endif #ifdef HAVE_DIRENT_H #include <dirent.h> #endif @@ -174,6 +177,13 @@ safe_get_max_fd(void) if (local_max_fd >= 0) return local_max_fd; #endif +#if defined(HAVE_SYS_RESOURCE_H) && defined(__OpenBSD__) + struct rlimit rl; + /* Not on the POSIX async signal safe functions list but likely + * safe. TODO - Someone should audit OpenBSD to make sure. */ + if (getrlimit(RLIMIT_NOFILE, &rl) >= 0) + return (long) rl.rlim_max; +#endif #ifdef _SC_OPEN_MAX local_max_fd = sysconf(_SC_OPEN_MAX); if (local_max_fd == -1) |