Rename module pty to pty-h.

* modules/pty-h: Renamed from modules/pty.
* modules/pty-h-tests: Renamed from modules/pty-tests.
* modules/pty-h-c++-tests: Renamed from modules/pty-c++-tests.
* tests/test-pty-h.c: Renamed from tests/test-pty.c.
* tests/test-pty-h-c++.cc: Renamed from tests/test-pty-c++.cc.
* doc/glibc-headers/pty.texi: Update.
* doc/gnulib-intro.texi: Update.
* modules/* (Depends-on): Update.
* modules/pty: New file.

diff --git a/ChangeLog b/ChangeLog
index e5b0812b243f8fb1f89e20d9ee87fe74fc29b924..6874340c9300447e7ac727053fd1d54c86688c79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module pty to pty-h.
+       * modules/pty-h: Renamed from modules/pty.
+       * modules/pty-h-tests: Renamed from modules/pty-tests.
+       * modules/pty-h-c++-tests: Renamed from modules/pty-c++-tests.
+       * tests/test-pty-h.c: Renamed from tests/test-pty.c.
+       * tests/test-pty-h-c++.cc: Renamed from tests/test-pty-c++.cc.
+       * doc/glibc-headers/pty.texi: Update.
+       * doc/gnulib-intro.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/pty: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module netinet_in to netinet_in-h.

diff --git a/doc/glibc-headers/pty.texi b/doc/glibc-headers/pty.texi
index 66e32fd98929eb05f5a9c902be1e3c5c8f0bc42d..ccc9d166b10273b5a7f2d692936f2d33e9fba65d 100644 (file)
--- a/doc/glibc-headers/pty.texi
+++ b/doc/glibc-headers/pty.texi
@@ -16,8 +16,8 @@ Documentation:
 @uref{https://www.kernel.org/doc/man-pages/online/pages/man3/openpty.3.html,,man openpty}.
 @end itemize
 
-Gnulib module: pty
-@mindex pty
+Gnulib module: pty-h
+@mindex pty-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/doc/gnulib-intro.texi b/doc/gnulib-intro.texi
index e06cc0a244cb681429ab897fb38d5196739dd1e5..11b786293fc03d5db679b80ce92436d4cb44e6eb 100644 (file)
--- a/doc/gnulib-intro.texi
+++ b/doc/gnulib-intro.texi
@@ -164,7 +164,7 @@ not ``debug'' builds (compiler option @samp{-MDd}).
 Note that some modules are currently unsupported on native Windows:
 @code{mgetgroups}, @code{getugroups}, @code{idcache},
 @code{userspec}, @code{openpty}, @code{login_tty}, @code{forkpty},
-@code{pt_chown}, @code{grantpt}, @code{pty}, @code{savewd},
+@code{pt_chown}, @code{grantpt}, @code{pty-h}, @code{savewd},
 @code{mkancesdirs}, @code{mkdir-p}, @code{euidaccess}, @code{faccessat}.
 The versions of Windows that are supported are Windows 10 and newer.
 @item

diff --git a/modules/forkpty b/modules/forkpty
index 1f52b900cd743937b30db994e249e9fc3030b934..0ff4bc750b28da698d4adf82c7397cb8f7b18cc6 100644 (file)
--- a/modules/forkpty
+++ b/modules/forkpty
@@ -7,7 +7,7 @@ lib/forkpty.c
 m4/pty.m4
 
 Depends-on:
-pty
+pty-h
 unistd
 openpty
 login_tty

diff --git a/modules/openpty b/modules/openpty
index a5f5cf84ddc5291b2db65888630138217c147b6b..0fc4960a2c8adb627bf17009960a90cd03816c81 100644 (file)
--- a/modules/openpty
+++ b/modules/openpty
@@ -6,7 +6,7 @@ lib/openpty.c
 m4/pty.m4
 
 Depends-on:
-pty
+pty-h
 extensions
 fcntl-h         [test $HAVE_OPENPTY = 0 || test $REPLACE_OPENPTY = 1]
 posix_openpt    [test $HAVE_OPENPTY = 0 || test $REPLACE_OPENPTY = 1]

diff --git a/modules/posixcheck b/modules/posixcheck
index 9cf7f3340c8f941e16ad3075085b5ba5136acd79..fc07d3b2d485ac295cfd7d272d147604e3f2a13e 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -23,7 +23,7 @@ monetary-h
 netdb-h
 poll-h
 pthread-h
-pty
+pty-h
 sched
 search
 signal-h

diff --git a/modules/pty b/modules/pty
index 7a1a2e3894ba73bf16a29f8c5e1b17bfc34f7ee3..bab79e5f1e909892471e7448e0da7532997fd2f8 100644 (file)
--- a/modules/pty
+++ b/modules/pty
@@ -1,49 +1,20 @@
 Description:
 A <pty.h> for systems that lacks it.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'pty-h' instead.
+
 Files:
-lib/pty.in.h
-m4/pty_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/c++defs
-snippet/warn-on-use
-termios
+pty-h
 
 configure.ac:
-gl_PTY_H
-gl_PTY_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += pty.h
-
-# We need the following in order to create <pty.h> when the system
-# doesn't have one that works with the given compiler.
-pty.h: pty.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
-@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
-       $(gl_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-             -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
-             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-             -e 's|@''NEXT_PTY_H''@|$(NEXT_PTY_H)|g' \
-             -e 's/@''GNULIB_FORKPTY''@/$(GNULIB_FORKPTY)/g' \
-             -e 's/@''GNULIB_OPENPTY''@/$(GNULIB_OPENPTY)/g' \
-             -e 's|@''HAVE_UTIL_H''@|$(HAVE_UTIL_H)|g' \
-             -e 's|@''HAVE_LIBUTIL_H''@|$(HAVE_LIBUTIL_H)|g' \
-             -e 's|@''HAVE_FORKPTY''@|$(HAVE_FORKPTY)|g' \
-             -e 's|@''HAVE_OPENPTY''@|$(HAVE_OPENPTY)|g' \
-             -e 's|@''REPLACE_FORKPTY''@|$(REPLACE_FORKPTY)|g' \
-             -e 's|@''REPLACE_OPENPTY''@|$(REPLACE_OPENPTY)|g' \
-             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             $(srcdir)/pty.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += pty.h pty.h-t
 
 Include:
 <pty.h>
@@ -55,4 +26,3 @@ License:
 LGPLv2+
 
 Maintainer:
-Simon Josefsson

diff --git a/modules/pty-c++-tests b/modules/pty-c++-tests
deleted file mode 100644 (file)
index 0f2e562..0000000
--- a/modules/pty-c++-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-pty-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-pty-c++
-check_PROGRAMS += test-pty-c++
-test_pty_c___SOURCES = test-pty-c++.cc
-test_pty_c___LDADD = $(LDADD) $(PTY_LIB) $(LIBINTL)
-endif

diff --git a/modules/pty-h b/modules/pty-h
new file mode 100644 (file)
index 0000000..7a1a2e3
--- /dev/null
+++ b/modules/pty-h
@@ -0,0 +1,58 @@
+Description:
+A <pty.h> for systems that lacks it.
+
+Files:
+lib/pty.in.h
+m4/pty_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/c++defs
+snippet/warn-on-use
+termios
+
+configure.ac:
+gl_PTY_H
+gl_PTY_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += pty.h
+
+# We need the following in order to create <pty.h> when the system
+# doesn't have one that works with the given compiler.
+pty.h: pty.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
+       $(gl_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''NEXT_PTY_H''@|$(NEXT_PTY_H)|g' \
+             -e 's/@''GNULIB_FORKPTY''@/$(GNULIB_FORKPTY)/g' \
+             -e 's/@''GNULIB_OPENPTY''@/$(GNULIB_OPENPTY)/g' \
+             -e 's|@''HAVE_UTIL_H''@|$(HAVE_UTIL_H)|g' \
+             -e 's|@''HAVE_LIBUTIL_H''@|$(HAVE_LIBUTIL_H)|g' \
+             -e 's|@''HAVE_FORKPTY''@|$(HAVE_FORKPTY)|g' \
+             -e 's|@''HAVE_OPENPTY''@|$(HAVE_OPENPTY)|g' \
+             -e 's|@''REPLACE_FORKPTY''@|$(REPLACE_FORKPTY)|g' \
+             -e 's|@''REPLACE_OPENPTY''@|$(REPLACE_OPENPTY)|g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             $(srcdir)/pty.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += pty.h pty.h-t
+
+Include:
+<pty.h>
+
+Link:
+$(PTY_LIB)
+
+License:
+LGPLv2+
+
+Maintainer:
+Simon Josefsson

diff --git a/modules/pty-h-c++-tests b/modules/pty-h-c++-tests
new file mode 100644 (file)
index 0000000..49af040
--- /dev/null
+++ b/modules/pty-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-pty-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-pty-h-c++
+check_PROGRAMS += test-pty-h-c++
+test_pty_h_c___SOURCES = test-pty-h-c++.cc
+test_pty_h_c___LDADD = $(LDADD) $(PTY_LIB) $(LIBINTL)
+endif

diff --git a/modules/pty-h-tests b/modules/pty-h-tests
new file mode 100644 (file)
index 0000000..30738e5
--- /dev/null
+++ b/modules/pty-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-pty-h.c
+
+Depends-on:
+pty-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pty-h
+check_PROGRAMS += test-pty-h

diff --git a/modules/pty-tests b/modules/pty-tests
deleted file mode 100644 (file)
index 211a064..0000000
--- a/modules/pty-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-pty.c
-
-Depends-on:
-pty-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-pty
-check_PROGRAMS += test-pty

diff --git a/tests/test-pty-c++.cc b/tests/test-pty-h-c++.cc
similarity index 100%
rename from tests/test-pty-c++.cc
rename to tests/test-pty-h-c++.cc

diff --git a/tests/test-pty.c b/tests/test-pty-h.c
similarity index 100%
rename from tests/test-pty.c
rename to tests/test-pty-h.c