Rename module sys_stat to sys_stat-h.

* modules/sys_stat-h: Renamed from modules/sys_stat. * modules/sys_stat-h-tests: Renamed from modules/sys_stat-tests. * modules/sys_stat-h-c++-tests: Renamed from modules/sys_stat-c++-tests. * tests/test-sys_stat-h.c: Renamed from tests/test-sys_stat.c. * tests/test-sys_stat-h-c++.cc: Renamed from tests/test-sys_stat-c++.cc. * doc/posix-headers/sys_stat.texi: Update. * doc/posix-functions/mkdir.texi: Update. * modules/* (Depends-on): Update. * modules/sys_stat: New file.
2026-04-28 06:33:36 +00:00 · 2024-12-27 23:40:10 +01:00
parent 878a961759
commit 984cbda2ae
66 changed files with 212 additions and 174 deletions
--- a/13
+++ b/13
@@ -1,3 +1,16 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module sys_stat to sys_stat-h.
+	* modules/sys_stat-h: Renamed from modules/sys_stat.
+	* modules/sys_stat-h-tests: Renamed from modules/sys_stat-tests.
+	* modules/sys_stat-h-c++-tests: Renamed from modules/sys_stat-c++-tests.
+	* tests/test-sys_stat-h.c: Renamed from tests/test-sys_stat.c.
+	* tests/test-sys_stat-h-c++.cc: Renamed from tests/test-sys_stat-c++.cc.
+	* doc/posix-headers/sys_stat.texi: Update.
+	* doc/posix-functions/mkdir.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/sys_stat: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>

 	Rename module sys_socket to sys_socket-h.
--- a/doc/posix-functions/mkdir.texi
+++ b/doc/posix-functions/mkdir.texi
@@ -4,11 +4,11 @@

 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkdir.html}

-Gnulib module: sys_stat or mkdir
-@mindex sys_stat
+Gnulib module: sys_stat-h or mkdir
+@mindex sys_stat-h
@mindex mkdir

-Portability problems fixed by either Gnulib module @code{sys_stat} or @code{mkdir}:
+Portability problems fixed by either Gnulib module @code{sys_stat-h} or @code{mkdir}:
@itemize
@item
 This function is declared in different header files (namely, @code{<io.h>} or
--- a/doc/posix-headers/sys_stat.texi
+++ b/doc/posix-headers/sys_stat.texi
@@ -3,10 +3,10 @@

 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_stat.h.html}

-Gnulib module: sys_stat
-@mindex sys_stat
+Gnulib module: sys_stat-h
+@mindex sys_stat-h

-Portability problems fixed by Gnulib module @code{sys_stat}:
+Portability problems fixed by Gnulib module @code{sys_stat-h}:
@itemize
@item
 The type @code{mode_t} is not defined on some platforms:
@@ -35,7 +35,7 @@ Use the gnulib module
@end itemize

@mindex windows-stat-inodes
-Portability problems fixed by Gnulib module @code{sys_stat}, together with module @code{windows-stat-inodes}:
+Portability problems fixed by Gnulib module @code{sys_stat-h}, together with module @code{windows-stat-inodes}:
@itemize
@item
 On Windows platforms (excluding Cygwin), @code{st_ino} is always 0.
--- a/modules/acl-permissions
+++ b/modules/acl-permissions
@@ -17,7 +17,7 @@ fstat
 minmax
 stat
 stdbool-h
-sys_stat
+sys_stat-h

 configure.ac:
 gl_FUNC_ACL
--- a/modules/at-internal
+++ b/modules/at-internal
@@ -10,7 +10,7 @@ errno-h
 fcntl-h
 intprops
 open       [case $host_os in mingw* | windows*) false;; *) :;; esac]
-sys_stat
+sys_stat-h
 unistd

 configure.ac:
--- a/modules/c-file-type
+++ b/modules/c-file-type
@@ -6,7 +6,7 @@ lib/file-type.h
 lib/c-file-type.c

 Depends-on:
-sys_stat
+sys_stat-h

 configure.ac:

--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -27,7 +27,7 @@ readlink
 glibc-internal/scratch_buffer
 stat
 stdbool-h
-sys_stat
+sys_stat-h
 unistd
 xalloc-die

--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -27,7 +27,7 @@ readlink                      [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $RE
 glibc-internal/scratch_buffer [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 stat                          [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 stdbool-h                     [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-sys_stat                      [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+sys_stat-h                    [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 unistd                        [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]

 configure.ac:
--- a/modules/chmod
+++ b/modules/chmod
@@ -6,7 +6,7 @@ lib/chmod.c
 m4/chmod.m4

 Depends-on:
-sys_stat
+sys_stat-h
 lstat           [test $REPLACE_CHMOD = 1]

 configure.ac:
--- a/modules/chown
+++ b/modules/chown
@@ -12,7 +12,7 @@ fstat           [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
 open            [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
 stat            [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
 stdbool-h       [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
-sys_stat        [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]
+sys_stat-h      [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1]

 configure.ac:
 gl_FUNC_CHOWN
--- a/modules/crypto/af_alg
+++ b/modules/crypto/af_alg
@@ -14,7 +14,7 @@ fseeko          [test $USE_AF_ALG = 1]
 ftello          [test $USE_AF_ALG = 1]
 fstat           [test $USE_AF_ALG = 1]
 sys_socket-h
-sys_stat
+sys_stat-h

 configure.ac:
 gl_AF_ALG
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -13,7 +13,7 @@ fcntl-h
 access          [test $HAVE_EUIDACCESS = 0]
 group-member    [test $HAVE_EUIDACCESS = 0]
 stat            [test $HAVE_EUIDACCESS = 0]
-sys_stat        [test $HAVE_EUIDACCESS = 0]
+sys_stat-h      [test $HAVE_EUIDACCESS = 0]

 configure.ac:
 gl_FUNC_EUIDACCESS
--- a/modules/fchdir
+++ b/modules/fchdir
@@ -26,7 +26,7 @@ realloc-posix    [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]
 stat             [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]
 stdbool-h        [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]
 strdup-posix     [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]
-sys_stat         [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]
+sys_stat-h       [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]

 configure.ac:
 gl_FUNC_FCHDIR
--- a/modules/fchmodat
+++ b/modules/fchmodat
@@ -7,7 +7,7 @@ lib/at-func.c
 m4/fchmodat.m4

 Depends-on:
-sys_stat
+sys_stat-h
 extensions
 errno-h         [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1]
 fcntl-h         [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1]
--- a/modules/file-type
+++ b/modules/file-type
@@ -9,7 +9,7 @@ Depends-on:
 c-file-type
 gettext-h
 gnulib-i18n
-sys_stat
+sys_stat-h

 configure.ac:

--- a/modules/filemode
+++ b/modules/filemode
@@ -8,7 +8,7 @@ lib/filemode.c
 m4/filemode.m4

 Depends-on:
-sys_stat
+sys_stat-h

 configure.ac:
 gl_FILEMODE
--- a/modules/findprog
+++ b/modules/findprog
@@ -9,7 +9,7 @@ m4/eaccess.m4

 Depends-on:
 stdbool-h
-sys_stat
+sys_stat-h
 xalloc
 xconcat-filename
 access
--- a/modules/findprog-in
+++ b/modules/findprog-in
@@ -9,7 +9,7 @@ m4/eaccess.m4

 Depends-on:
 stdbool-h
-sys_stat
+sys_stat-h
 filename
 concat-filename
 access
--- a/modules/findprog-lgpl
+++ b/modules/findprog-lgpl
@@ -10,7 +10,7 @@ m4/eaccess.m4

 Depends-on:
 stdbool-h
-sys_stat
+sys_stat-h
 strdup
 concat-filename
 access
--- a/modules/fstat
+++ b/modules/fstat
@@ -8,7 +8,7 @@ lib/stat-w32.c
 m4/fstat.m4

 Depends-on:
-sys_stat
+sys_stat-h
 largefile
 pathmax         [test $REPLACE_FSTAT = 1]
 stat            [test $REPLACE_FSTAT = 1]
--- a/modules/fstatat
+++ b/modules/fstatat
@@ -8,7 +8,7 @@ m4/fstatat.m4
 m4/lstat.m4

 Depends-on:
-sys_stat
+sys_stat-h
 extensions
 at-internal     [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1]
 errno-h         [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1]
--- a/modules/futimens
+++ b/modules/futimens
@@ -6,7 +6,7 @@ lib/futimens.c
 m4/futimens.m4

 Depends-on:
-sys_stat
+sys_stat-h
 extensions
 utimens         [test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1]

--- a/modules/getcwd-tests
+++ b/modules/getcwd-tests
@@ -10,7 +10,7 @@ fcntl-h
 getcwd-lgpl
 pathmax
 stdbool-h
-sys_stat
+sys_stat-h
 test-framework-sh

 configure.ac:
--- a/modules/getumask
+++ b/modules/getumask
@@ -6,7 +6,7 @@ lib/getumask.c
 m4/getumask.m4

 Depends-on:
-sys_stat
+sys_stat-h
 extensions
 c99             [test $HAVE_GETUMASK = 0]
 unistd          [test $HAVE_GETUMASK = 0]
--- a/modules/glob-h
+++ b/modules/glob-h
@@ -15,7 +15,7 @@ snippet/c++defs
 snippet/warn-on-use
 libc-config
 lstat
-sys_stat
+sys_stat-h

 configure.ac:
 gl_GLOB_H
--- a/modules/isapipe
+++ b/modules/isapipe
@@ -8,7 +8,7 @@ m4/isapipe.m4

 Depends-on:
 stdbool-h       [test $HAVE_ISAPIPE = 0]
-sys_stat        [test $HAVE_ISAPIPE = 0]
+sys_stat-h      [test $HAVE_ISAPIPE = 0]
 unistd          [test $HAVE_ISAPIPE = 0]
 msvc-nothrow    [test $HAVE_ISAPIPE = 0]
 fstat           [test $HAVE_ISAPIPE = 0]
--- a/modules/largefile-tests
+++ b/modules/largefile-tests
@@ -4,7 +4,7 @@ tests/test-largefile.c
 Depends-on:
 intprops
 sys_types
-sys_stat
+sys_stat-h

 configure.ac:

--- a/modules/lchmod
+++ b/modules/lchmod
@@ -13,7 +13,7 @@ fcntl-h       [test $HAVE_LCHMOD = 0]
 intprops      [test $HAVE_LCHMOD = 0]
 lstat         [test $HAVE_LCHMOD = 0]
 readlink      [test $HAVE_LCHMOD = 0]
-sys_stat
+sys_stat-h
 unistd        [test $HAVE_LCHMOD = 0]

 configure.ac:
--- a/modules/lchown
+++ b/modules/lchown
@@ -11,7 +11,7 @@ readlink        [test $HAVE_LCHOWN = 0]
 chown           [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
 errno-h         [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
 stdbool-h       [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
-sys_stat        [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
+sys_stat-h      [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1]
 lstat           [test $REPLACE_LCHOWN = 1]

 configure.ac:
--- a/modules/link
+++ b/modules/link
@@ -10,7 +10,7 @@ unistd
 free-posix      [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
 stat            [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
 strdup-posix    [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
-sys_stat        [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
+sys_stat-h      [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]

 configure.ac:
 gl_FUNC_LINK
--- a/modules/link-tests
+++ b/modules/link-tests
@@ -8,7 +8,7 @@ Depends-on:
 ignore-value
 errno-h
 stdbool-h
-sys_stat
+sys_stat-h

 configure.ac:

--- a/modules/lstat
+++ b/modules/lstat
@@ -6,7 +6,7 @@ lib/lstat.c
 m4/lstat.m4

 Depends-on:
-sys_stat
+sys_stat-h
 largefile
 stat            [test $REPLACE_LSTAT = 1]
 stat-time       [test $REPLACE_LSTAT = 1]
--- a/modules/mkancesdirs
+++ b/modules/mkancesdirs
@@ -11,7 +11,7 @@ fcntl-h
 filename
 savewd
 stat-macros
-sys_stat
+sys_stat-h

 configure.ac:
 gl_MKANCESDIRS
--- a/modules/mkdir
+++ b/modules/mkdir
@@ -6,7 +6,7 @@ lib/mkdir.c
 m4/mkdir.m4

 Depends-on:
-sys_stat
+sys_stat-h
 dirname-lgpl    [test $REPLACE_MKDIR = 1]
 stat            [test $REPLACE_MKDIR = 1]

--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -23,7 +23,7 @@ savewd
 stat
 stat-macros
 stdbool-h
-sys_stat
+sys_stat-h

 configure.ac:
 gl_MKDIR_PARENTS
--- a/modules/mkdirat
+++ b/modules/mkdirat
@@ -7,7 +7,7 @@ lib/at-func.c
 m4/mkdirat.m4

 Depends-on:
-sys_stat
+sys_stat-h
 extensions
 at-internal     [test $HAVE_MKDIRAT = 0]
 errno-h         [test $HAVE_MKDIRAT = 0]
--- a/modules/mkfifo
+++ b/modules/mkfifo
@@ -6,7 +6,7 @@ lib/mkfifo.c
 m4/mkfifo.m4

 Depends-on:
-sys_stat
+sys_stat-h
 stat            [test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1]

 configure.ac:
--- a/modules/mkfifoat
+++ b/modules/mkfifoat
@@ -9,7 +9,7 @@ lib/at-func.c
 m4/mkfifoat.m4

 Depends-on:
-sys_stat
+sys_stat-h
 extensions
 fcntl-h         [test $HAVE_MKFIFOAT = 0 || test $REPLACE_MKFIFOAT = 1 || test $HAVE_MKNODAT = 0 || test $REPLACE_MKNODAT = 1]
 fstatat         [test $REPLACE_MKFIFOAT = 1 || test $REPLACE_MKNODAT = 1]
--- a/modules/mknod
+++ b/modules/mknod
@@ -6,7 +6,7 @@ lib/mknod.c
 m4/mknod.m4

 Depends-on:
-sys_stat
+sys_stat-h
 extensions
 mkfifo          [test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1]
 stat            [test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1]
--- a/modules/modechange
+++ b/modules/modechange
@@ -11,7 +11,7 @@ Depends-on:
 stat
 stat-macros
 stdbool-h
-sys_stat
+sys_stat-h
 xalloc

 configure.ac:
--- a/modules/openat
+++ b/modules/openat
@@ -14,7 +14,7 @@ extensions
 largefile
 openat-h        [test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1]
 stdbool-h       [test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1]
-sys_stat        [test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1]
+sys_stat-h      [test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1]
 cloexec         [test $REPLACE_OPENAT = 1]
 fstat           [test $REPLACE_OPENAT = 1]
 at-internal     [test $HAVE_OPENAT = 0]
--- a/modules/openat-h
+++ b/modules/openat-h
@@ -8,7 +8,7 @@ Depends-on:
 extern-inline
 fcntl-h
 stdbool-h
-sys_stat
+sys_stat-h
 unistd

 configure.ac:
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -38,7 +38,7 @@ sys_random-h
 sys_resource-h
 sys_select-h
 sys_socket-h
-sys_stat
+sys_stat-h
 sys_time
 sys_times
 sys_utsname
--- a/modules/read-file
+++ b/modules/read-file
@@ -15,7 +15,7 @@ malloc-posix
 memset_explicit
 realloc-posix
 stdint-h
-sys_stat
+sys_stat-h

 configure.ac:
 gl_PREREQ_READ_FILE
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -75,7 +75,7 @@ stdckdint-h
 stdint-h
 stdlib-h
 string-h
-sys_stat
+sys_stat-h
 unistd
 xalloc-oversized

--- a/modules/remove-tests
+++ b/modules/remove-tests
@@ -6,7 +6,7 @@ tests/macros.h
 Depends-on:
 ignore-value
 symlink
-sys_stat
+sys_stat-h

 configure.ac:

--- a/modules/rename-tests
+++ b/modules/rename-tests
@@ -10,7 +10,7 @@ errno-h
 link
 stdbool-h
 symlink
-sys_stat
+sys_stat-h
 opendir
 readdir
 closedir
--- a/modules/rmdir
+++ b/modules/rmdir
@@ -8,7 +8,7 @@ m4/rmdir.m4
 Depends-on:
 unistd
 filename        [test $REPLACE_RMDIR = 1]
-sys_stat        [test $REPLACE_RMDIR = 1]
+sys_stat-h      [test $REPLACE_RMDIR = 1]

 configure.ac:
 gl_FUNC_RMDIR
--- a/modules/stat
+++ b/modules/stat
@@ -8,7 +8,7 @@ lib/stat-w32.c
 m4/stat.m4

 Depends-on:
-sys_stat
+sys_stat-h
 largefile
 assert-h        [test $REPLACE_STAT = 1]
 filename        [test $REPLACE_STAT = 1]
--- a/modules/stat-size
+++ b/modules/stat-size
@@ -7,7 +7,7 @@ m4/stat-size.m4

 Depends-on:
 fileblocks
-sys_stat
+sys_stat-h

 configure.ac:
 gl_STAT_SIZE
--- a/modules/supersede
+++ b/modules/supersede
@@ -10,7 +10,7 @@ Depends-on:
 c99
 fcntl-h
 stdbool-h
-sys_stat
+sys_stat-h
 clean-temp
 tempname
 canonicalize
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -1,93 +1,20 @@
 Description:
 A <sys/stat.h> for systems with missing declarations.

+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_stat-h' instead.
+
 Files:
-lib/sys_stat.in.h
-m4/sys_stat_h.m4
-m4/unistd_h.m4
-m4/pid_t.m4

 Depends-on:
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
-sys_types
-time-h
+sys_stat-h

 configure.ac:
-gl_SYS_STAT_H
-gl_SYS_STAT_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P

 Makefile.am:
-BUILT_SOURCES += sys/stat.h
-
-# We need the following in order to create <sys/stat.h> when the system
-# has one that is incomplete.
-sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_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|@''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_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
-	      -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \
-	      -e 's/@''GNULIB_CHMOD''@/$(GNULIB_CHMOD)/g' \
-	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
-	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
-	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
-	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
-	      -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \
-	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
-	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
-	      -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \
-	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
-	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
-	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
-	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
-	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
-	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
-	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
-	      -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \
-	      -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \
-	      -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \
-	      -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \
-	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
-	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
-	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
-	      -e 's|@''HAVE_GETUMASK''@|$(HAVE_GETUMASK)|g' \
-	      -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \
-	      -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
-	      -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \
-	      -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \
-	      -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \
-	      -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \
-	      -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \
-	      -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \
-	      -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \
-	      -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \
-	      -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \
-	      -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \
-	      -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \
-	      -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \
-	      -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \
-	      -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \
-	      -e 's|@''REPLACE_MKFIFOAT''@|$(REPLACE_MKFIFOAT)|g' \
-	      -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \
-	      -e 's|@''REPLACE_MKNODAT''@|$(REPLACE_MKNODAT)|g' \
-	      -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \
-	      -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      $(srcdir)/sys_stat.in.h > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
-MOSTLYCLEANDIRS += sys

 Include:
 <sys/stat.h>
@@ -96,4 +23,3 @@ License:
 LGPLv2+

 Maintainer:
-all
--- a/modules/sys_stat-c++-tests
+++ b/modules/sys_stat-c++-tests
@@ -1,19 +0,0 @@
-Files:
-tests/test-sys_stat-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-sys_stat-c++
-check_PROGRAMS += test-sys_stat-c++
-test_sys_stat_c___SOURCES = test-sys_stat-c++.cc
-test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(MBRTOWC_LIB) $(GETRANDOM_LIB)
-endif
--- a/modules/sys_stat-h
+++ b/modules/sys_stat-h
@@ -0,0 +1,99 @@
+Description:
+A <sys/stat.h> for systems with missing declarations.
+
+Files:
+lib/sys_stat.in.h
+m4/sys_stat_h.m4
+m4/unistd_h.m4
+m4/pid_t.m4
+
+Depends-on:
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+sys_types
+time-h
+
+configure.ac:
+gl_SYS_STAT_H
+gl_SYS_STAT_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/stat.h
+
+# We need the following in order to create <sys/stat.h> when the system
+# has one that is incomplete.
+sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_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|@''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_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
+	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
+	      -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \
+	      -e 's/@''GNULIB_CHMOD''@/$(GNULIB_CHMOD)/g' \
+	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
+	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
+	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
+	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
+	      -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \
+	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
+	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \
+	      -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \
+	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \
+	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \
+	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \
+	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \
+	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \
+	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \
+	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \
+	      -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \
+	      -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \
+	      -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \
+	      -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \
+	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
+	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
+	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
+	      -e 's|@''HAVE_GETUMASK''@|$(HAVE_GETUMASK)|g' \
+	      -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \
+	      -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
+	      -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \
+	      -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \
+	      -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \
+	      -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \
+	      -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \
+	      -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \
+	      -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \
+	      -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \
+	      -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \
+	      -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \
+	      -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \
+	      -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \
+	      -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \
+	      -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \
+	      -e 's|@''REPLACE_MKFIFOAT''@|$(REPLACE_MKFIFOAT)|g' \
+	      -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \
+	      -e 's|@''REPLACE_MKNODAT''@|$(REPLACE_MKNODAT)|g' \
+	      -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \
+	      -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      $(srcdir)/sys_stat.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/stat.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
--- a/modules/sys_stat-h-c++-tests
+++ b/modules/sys_stat-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_stat-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_stat-h-c++
+check_PROGRAMS += test-sys_stat-h-c++
+test_sys_stat_h_c___SOURCES = test-sys_stat-h-c++.cc
+test_sys_stat_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(MBRTOWC_LIB) $(GETRANDOM_LIB)
+endif
--- a/modules/sys_stat-h-tests
+++ b/modules/sys_stat-h-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-sys_stat-h.c
+
+Depends-on:
+assert-h
+sys_stat-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sys_stat-h
+check_PROGRAMS += test-sys_stat-h
--- a/modules/sys_stat-tests
+++ b/modules/sys_stat-tests
@@ -1,12 +0,0 @@
-Files:
-tests/test-sys_stat.c
-
-Depends-on:
-assert-h
-sys_stat-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-sys_stat
-check_PROGRAMS += test-sys_stat
--- a/modules/tempname
+++ b/modules/tempname
@@ -18,7 +18,7 @@ lstat
 mkdir
 stdbool-h
 stdint-h
-sys_stat
+sys_stat-h
 time-h

 configure.ac:
--- a/modules/tmpdir
+++ b/modules/tmpdir
@@ -10,7 +10,7 @@ Depends-on:
 secure_getenv
 stat
 stdbool-h
-sys_stat
+sys_stat-h
 pathmax

 configure.ac:
--- a/modules/truncate
+++ b/modules/truncate
@@ -9,7 +9,7 @@ Depends-on:
 unistd
 sys_types
 largefile
-sys_stat
+sys_stat-h
 stat            [test $REPLACE_TRUNCATE = 1]
 open            [test $HAVE_DECL_TRUNCATE = 0 || test $REPLACE_TRUNCATE = 1]
 ftruncate       [test $HAVE_DECL_TRUNCATE = 0 || test $REPLACE_TRUNCATE = 1]
--- a/modules/unlinkat
+++ b/modules/unlinkat
@@ -12,7 +12,7 @@ unistd
 extensions
 fcntl-h         [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1]
 openat-h        [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1]
-sys_stat        [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1]
+sys_stat-h      [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1]
 at-internal     [test $HAVE_UNLINKAT = 0]
 errno-h         [test $HAVE_UNLINKAT = 0]
 fchdir          [test $HAVE_UNLINKAT = 0]
--- a/modules/utimens
+++ b/modules/utimens
@@ -18,7 +18,7 @@ msvc-nothrow
 stat
 stat-time
 stdbool-h
-sys_stat
+sys_stat-h
 sys_time
 time-h
 utime
--- a/modules/utimensat
+++ b/modules/utimensat
@@ -7,7 +7,7 @@ lib/at-func.c
 m4/utimensat.m4

 Depends-on:
-sys_stat
+sys_stat-h
 extensions
 at-internal     [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]
 errno-h         [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1]
--- a/modules/windows-stat-override
+++ b/modules/windows-stat-override
@@ -9,7 +9,7 @@ have side effects on the compilation of the main modules in lib/.
 Files:

 Depends-on:
-sys_stat
+sys_stat-h

 configure.ac:
 gl_SYS_STAT_H_REQUIRE_DEFAULTS
--- a/tests/test-sys_stat-h-c++.cc
+++ b/tests/test-sys_stat-h-c++.cc
--- a/tests/test-sys_stat-h.c
+++ b/tests/test-sys_stat-h.c