[pty] Fix ptsname_r fallback

If `posix_openpt` is available, also `ptsname` should be available.
ruby · Apr 14, 2024 · 3368913 · 3368913
1 parent 04ba96e
commit 3368913
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
@@ -13,11 +13,13 @@
     have_header("util.h") # OpenBSD openpty
     util = have_library("util", "openpty")
   end
-  if have_func("posix_openpt") or
+  openpt = have_func("posix_openpt")
+  if openpt
+    have_func("ptsname_r") or have_func("ptsname")
+  end
+  if openpt
       (util or have_func("openpty")) or
       have_func("_getpty") or
-      have_func("ptsname_r") or
-      have_func("ptsname") or
       have_func("ioctl")
     create_makefile('pty')
   end

diff --git a/ext/pty/pty.c b/ext/pty/pty.c
@@ -256,7 +256,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
     RB_GC_GUARD(carg.execarg_obj);
 }
 
-#if defined(HAVE_PTSNAME) && !defined(HAVE_PTSNAME_R)
+#if (defined(HAVE_POSIX_OPENPT) || defined(HAVE_PTSNAME)) && !defined(HAVE_PTSNAME_R)
 /* glibc only, not obsolete interface on Tru64 or HP-UX */
 static int
 ptsname_r(int fd, char *buf, size_t buflen)