]> granicus.if.org Git - python/commitdiff
Fix computation of max_fd on OpenBSD. Issue #23852.
authorGregory P. Smith <greg@krypto.org>
Sun, 26 Apr 2015 06:43:34 +0000 (23:43 -0700)
committerGregory P. Smith <greg@krypto.org>
Sun, 26 Apr 2015 06:43:34 +0000 (23:43 -0700)
Modules/_posixsubprocess.c

index f0a272e118f434acfa935f5d9ae9716f6488edec..452d592f15042032fbb17e72b994222c80eafb42 100644 (file)
@@ -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)