From e08b28235a863323ca3a7e444776bb7803e77caf Mon Sep 17 00:00:00 2001
From: "Erlend E. Aasland" <erlend@python.org>
Date: Tue, 7 Jan 2025 22:42:36 +0100
Subject: gh-127614: Correctly check for ttyname_r() in configure (#128503)
PR #14868 replaced the ttyname() call with ttyname_r(), but the old
check remained.
---
Modules/clinic/posixmodule.c.h | 6 +++---
Modules/posixmodule.c | 2 +-
configure | 6 +++---
configure.ac | 2 +-
pyconfig.h.in | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 554299b..4e6c5b0 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -309,7 +309,7 @@ exit:
return return_value;
}
-#if defined(HAVE_TTYNAME)
+#if defined(HAVE_TTYNAME_R)
PyDoc_STRVAR(os_ttyname__doc__,
"ttyname($module, fd, /)\n"
@@ -342,7 +342,7 @@ exit:
return return_value;
}
-#endif /* defined(HAVE_TTYNAME) */
+#endif /* defined(HAVE_TTYNAME_R) */
#if defined(HAVE_CTERMID)
@@ -13140,4 +13140,4 @@ os__emscripten_debugger(PyObject *module, PyObject *Py_UNUSED(ignored))
#ifndef OS__EMSCRIPTEN_DEBUGGER_METHODDEF
#define OS__EMSCRIPTEN_DEBUGGER_METHODDEF
#endif /* !defined(OS__EMSCRIPTEN_DEBUGGER_METHODDEF) */
-/*[clinic end generated code: output=9c2ca1dbf986c62c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=39b69b279fd637f7 input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 151d469..bb8d698 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -3347,7 +3347,7 @@ os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd,
#endif
-#ifdef HAVE_TTYNAME
+#ifdef HAVE_TTYNAME_R
/*[clinic input]
os.ttyname
diff --git a/configure b/configure
index 08c10ff..6e1b393 100755
--- a/configure
+++ b/configure
@@ -19986,10 +19986,10 @@ then :
printf "%s\n" "#define HAVE_TRUNCATE 1" >>confdefs.h
fi
-ac_fn_c_check_func "$LINENO" "ttyname" "ac_cv_func_ttyname"
-if test "x$ac_cv_func_ttyname" = xyes
+ac_fn_c_check_func "$LINENO" "ttyname_r" "ac_cv_func_ttyname_r"
+if test "x$ac_cv_func_ttyname_r" = xyes
then :
- printf "%s\n" "#define HAVE_TTYNAME 1" >>confdefs.h
+ printf "%s\n" "#define HAVE_TTYNAME_R 1" >>confdefs.h
fi
ac_fn_c_check_func "$LINENO" "umask" "ac_cv_func_umask"
diff --git a/configure.ac b/configure.ac
index fb1dd77..6d44be8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5152,7 +5152,7 @@ AC_CHECK_FUNCS([ \
sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
- tmpnam tmpnam_r truncate ttyname umask uname unlinkat unlockpt utimensat utimes vfork \
+ tmpnam tmpnam_r truncate ttyname_r umask uname unlinkat unlockpt utimensat utimes vfork \
wait wait3 wait4 waitid waitpid wcscoll wcsftime wcsxfrm wmemcmp writev \
])
diff --git a/pyconfig.h.in b/pyconfig.h.in
index d862966..874b98d 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -1506,8 +1506,8 @@
/* Define to 1 if you have the 'truncate' function. */
#undef HAVE_TRUNCATE
-/* Define to 1 if you have the 'ttyname' function. */
-#undef HAVE_TTYNAME
+/* Define to 1 if you have the 'ttyname_r' function. */
+#undef HAVE_TTYNAME_R
/* Define to 1 if you don't have 'tm_zone' but do have the external array
'tzname'. */
--
cgit v0.12