Rename module sys_ioctl to sys_ioctl-h.

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

diff --git a/ChangeLog b/ChangeLog
index bb8d0ba787e45acdeb3896f1c3116a45421d8ca3..ec7e2c105f927b84f5f7d514ac6f38df58b6cb66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module sys_ioctl to sys_ioctl-h.
+       * modules/sys_ioctl-h: Renamed from modules/sys_ioctl.
+       * modules/sys_ioctl-h-tests: Renamed from modules/sys_ioctl-tests.
+       * modules/sys_ioctl-h-c++-tests: Renamed from
+       modules/sys_ioctl-c++-tests.
+       * tests/test-sys_ioctl-h.c: Renamed from tests/test-sys_ioctl.c.
+       * tests/test-sys_ioctl-h-c++.cc: Renamed from
+       tests/test-sys_ioctl-c++.cc.
+       * doc/glibc-headers/sys_ioctl.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/sys_ioctl: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module sys_file to sys_file-h.

diff --git a/doc/glibc-headers/sys_ioctl.texi b/doc/glibc-headers/sys_ioctl.texi
index 3f4380020b3bb573967497bdbdbf9d6910fc994c..fda5d41087e223d8dc5a495a2f26c7ec2ac7c0c8 100644 (file)
--- a/doc/glibc-headers/sys_ioctl.texi
+++ b/doc/glibc-headers/sys_ioctl.texi
@@ -16,8 +16,8 @@ Documentation:
 @uref{https://www.kernel.org/doc/man-pages/online/pages/man2/ioctl.2.html,,man ioctl}.
 @end itemize
 
-Gnulib module: sys_ioctl
-@mindex sys_ioctl
+Gnulib module: sys_ioctl-h
+@mindex sys_ioctl-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/ioctl b/modules/ioctl
index 96b15e580bf23282e99b1951ba7e55a38f909bce..eeb4d7089e8580fab20c320eff9520d2ac0aad22 100644 (file)
--- a/modules/ioctl
+++ b/modules/ioctl
@@ -7,7 +7,7 @@ lib/w32sock.h
 m4/ioctl.m4
 
 Depends-on:
-sys_ioctl
+sys_ioctl-h
 sys_socket      [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
 errno-h         [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
 fd-hook         [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]

diff --git a/modules/login_tty b/modules/login_tty
index 7b09ec1bd2984d3ff0525b96177e869b37d795b4..15f3cc2698e2168ad8a7dbecbb624a86f057f0c9 100644 (file)
--- a/modules/login_tty
+++ b/modules/login_tty
@@ -9,7 +9,7 @@ m4/pty.m4
 
 Depends-on:
 utmp
-sys_ioctl
+sys_ioctl-h
 open            [test $HAVE_LOGIN_TTY = 0]
 
 configure.ac:

diff --git a/modules/poll-tests b/modules/poll-tests
index 950f395b78297b801685c24ad4bd2dd7d9cfec03..e6663a09c42f7709de7c77cc36f70deb483ea779 100644 (file)
--- a/modules/poll-tests
+++ b/modules/poll-tests
@@ -8,7 +8,7 @@ stdbool-h
 sys_socket
 netinet_in-h
 arpa_inet-h
-sys_ioctl
+sys_ioctl-h
 extensions
 inet_pton
 errno-h

diff --git a/modules/posixcheck b/modules/posixcheck
index 98f560548e82a6013b2bdeda5edea5de86fb6f09..a73443bbac97c1d0a47df71c8f1b498a4c12f671 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -33,7 +33,7 @@ stdlib-h
 string-h
 strings-h
 sys_file-h
-sys_ioctl
+sys_ioctl-h
 sys_random
 sys_resource
 sys_select

diff --git a/modules/pselect-tests b/modules/pselect-tests
index 9483e06218cdf1ad0d8914b7d1d3194538c1733e..c90a5d12cd8db35f14157483da77ae5e94fac861 100644 (file)
--- a/modules/pselect-tests
+++ b/modules/pselect-tests
@@ -9,7 +9,7 @@ stdbool-h
 netinet_in-h
 arpa_inet-h
 unistd
-sys_ioctl
+sys_ioctl-h
 extensions
 inet_pton
 errno-h

diff --git a/modules/select-tests b/modules/select-tests
index 903aedf397277c4f9b55eac4e693a5f0007df2a1..77b26b7e73751c5f34652305d140ee62d5a7b04d 100644 (file)
--- a/modules/select-tests
+++ b/modules/select-tests
@@ -14,7 +14,7 @@ sys_socket
 netinet_in-h
 arpa_inet-h
 unistd
-sys_ioctl
+sys_ioctl-h
 extensions
 inet_pton
 errno-h

diff --git a/modules/sys_ioctl b/modules/sys_ioctl
index cf99b56252abf0ed21ee7d89466944c04f465f7f..6607af2a7f676cdfccede6946168888494b1c4e2 100644 (file)
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -1,46 +1,20 @@
 Description:
 A <sys/ioctl.h> for systems with missing declarations.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_ioctl-h' instead.
+
 Files:
-lib/sys_ioctl.in.h
-m4/sys_ioctl_h.m4
 
 Depends-on:
-gen-header
-include_next
-snippet/c++defs
-snippet/warn-on-use
-unistd
+sys_ioctl-h
 
 configure.ac:
-gl_SYS_IOCTL_H
-gl_SYS_IOCTL_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/ioctl.h
-
-# We need the following in order to create <sys/ioctl.h> when the system
-# does not have a complete one.
-sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
-       $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-             -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_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_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \
-             -e 's/@''GNULIB_IOCTL''@/$(GNULIB_IOCTL)/g' \
-             -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \
-             -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
-             -e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \
-             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             $(srcdir)/sys_ioctl.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t
-MOSTLYCLEANDIRS += sys
 
 Include:
 <sys/ioctl.h>
@@ -49,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

diff --git a/modules/sys_ioctl-c++-tests b/modules/sys_ioctl-c++-tests
deleted file mode 100644 (file)
index 710c360..0000000
--- a/modules/sys_ioctl-c++-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-sys_ioctl-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-sys_ioctl-c++
-check_PROGRAMS += test-sys_ioctl-c++
-test_sys_ioctl_c___SOURCES = test-sys_ioctl-c++.cc
-test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN)
-endif

diff --git a/modules/sys_ioctl-h b/modules/sys_ioctl-h
new file mode 100644 (file)
index 0000000..cf99b56
--- /dev/null
+++ b/modules/sys_ioctl-h
@@ -0,0 +1,52 @@
+Description:
+A <sys/ioctl.h> for systems with missing declarations.
+
+Files:
+lib/sys_ioctl.in.h
+m4/sys_ioctl_h.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/c++defs
+snippet/warn-on-use
+unistd
+
+configure.ac:
+gl_SYS_IOCTL_H
+gl_SYS_IOCTL_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/ioctl.h
+
+# We need the following in order to create <sys/ioctl.h> when the system
+# does not have a complete one.
+sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+       $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_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_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \
+             -e 's/@''GNULIB_IOCTL''@/$(GNULIB_IOCTL)/g' \
+             -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \
+             -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
+             -e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             $(srcdir)/sys_ioctl.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/ioctl.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/sys_ioctl-h-c++-tests b/modules/sys_ioctl-h-c++-tests
new file mode 100644 (file)
index 0000000..dfd71b8
--- /dev/null
+++ b/modules/sys_ioctl-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_ioctl-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_ioctl-h-c++
+check_PROGRAMS += test-sys_ioctl-h-c++
+test_sys_ioctl_h_c___SOURCES = test-sys_ioctl-h-c++.cc
+test_sys_ioctl_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN)
+endif

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

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

diff --git a/modules/tcgetsid b/modules/tcgetsid
index 67e74cabf779b1a7154394b3de2cc06b6aaae5b6..f5300c8d42b2d974d19decaa7cff0309922fcec5 100644 (file)
--- a/modules/tcgetsid
+++ b/modules/tcgetsid
@@ -9,7 +9,7 @@ m4/tcgetsid.m4
 Depends-on:
 termios
 extensions
-sys_ioctl       [test $HAVE_TCGETSID = 0]
+sys_ioctl-h     [test $HAVE_TCGETSID = 0]
 
 configure.ac:
 gl_FUNC_TCGETSID

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

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