1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[pty] Fix ptsname_r fallback

Browse Source 
If `posix_openpt` is available, also `ptsname` should be available.
This commit is contained in:
Nobuyoshi Nakada 2024-04-14 19:43:21 +09:00
parent 04ba96e619
commit 3368913be3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/pty/extconf.rb
View File

@ -13,11 +13,13 @@ if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
have_header("util.h") # OpenBSD openpty have_header("util.h") # OpenBSD openpty
util = have_library("util", "openpty") util = have_library("util", "openpty")
end 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 (util or have_func("openpty")) or
have_func("_getpty") or have_func("_getpty") or
have_func("ptsname_r") or
have_func("ptsname") or
have_func("ioctl") have_func("ioctl")
create_makefile('pty') create_makefile('pty')
end end

2
ext/pty/pty.c
View File

@ -256,7 +256,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
RB_GC_GUARD(carg.execarg_obj); 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 */ /* glibc only, not obsolete interface on Tru64 or HP-UX */
static int static int
ptsname_r(int fd, char *buf, size_t buflen) ptsname_r(int fd, char *buf, size_t buflen)