From 88776ceb6f7a888e2ee6ccf81958a90ec1cee3c2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 28 Mar 2020 15:54:12 +0100 Subject: [PATCH] Use module 'filename' instead of module 'dosname'. * lib/at-func.c: Include filename.h instead of dosname.h. * lib/unlinkat.c: Likewise. * modules/areadlinkat (Depends-on): Add filename. Remove dosname. * modules/areadlinkat-with-size (Depends-on): Likewise. * modules/faccessat (Depends-on): Likewise. * modules/fchmodat (Depends-on): Likewise. * modules/fchownat (Depends-on): Likewise. * modules/fstatat (Depends-on): Likewise. * modules/mkdirat (Depends-on): Likewise. * modules/mkfifoat (Depends-on): Likewise. * modules/readlinkat (Depends-on): Likewise. * modules/selinux-at (Depends-on): Likewise. * modules/symlinkat (Depends-on): Likewise. * modules/unlinkat (Depends-on): Likewise. * modules/utimensat (Depends-on): Likewise. * lib/at-func2.c: Include filename.h instead of dosname.h. * modules/linkat (Depends-on): Add filename. Remove dosname. * modules/renameatu (Depends-on): Likewise. * lib/canonicalize.c: Include filename.h instead of dosname.h. * lib/canonicalize-lgpl.c: Likewise. * modules/canonicalize (Depends-on): Add filename. * modules/canonicalize-lgpl (Depends-on): Likewise. * lib/dirname.h: Include filename.h instead of dosname.h. * modules/dirname-lgpl (Depends-on): Add filename. Remove dosname. * lib/fchdir.c: Include filename.h instead of dosname.h. * modules/fchdir (Depends-on): Add filename. Remove dosname. * lib/openat.c: Include filename.h instead of dosname.h. * modules/openat (Depends-on): Add filename. Remove dosname. * lib/rmdir.c: Include filename.h instead of dosname.h. * modules/rmdir (Depends-on): Add filename. Remove dosname. * lib/savewd.c: Include filename.h instead of dosname.h. * modules/savewd (Depends-on): Add filename. Remove dosname. * lib/unlink.c: Include filename.h instead of dosname.h. * modules/unlink (Depends-on): Add filename. Remove dosname. * modules/relocatable-prog-wrapper (Depends-on): Add filename. * lib/relocwrapper.c: Update comments. * modules/lstat (Depends-on): Remove dosname. --- ChangeLog | 52 ++++++++++++++++++++++++++++++++ lib/at-func.c | 2 +- lib/at-func2.c | 2 +- lib/canonicalize-lgpl.c | 2 +- lib/canonicalize.c | 2 +- lib/dirname.h | 2 +- lib/fchdir.c | 2 +- lib/openat.c | 2 +- lib/relocwrapper.c | 3 +- lib/rmdir.c | 2 +- lib/savewd.c | 2 +- lib/unlink.c | 2 +- lib/unlinkat.c | 2 +- modules/areadlinkat | 2 +- modules/areadlinkat-with-size | 2 +- modules/canonicalize | 1 + modules/canonicalize-lgpl | 1 + modules/dirname-lgpl | 2 +- modules/faccessat | 2 +- modules/fchdir | 2 +- modules/fchmodat | 2 +- modules/fchownat | 2 +- modules/fstatat | 2 +- modules/linkat | 2 +- modules/lstat | 1 - modules/mkdirat | 2 +- modules/mkfifoat | 2 +- modules/openat | 2 +- modules/readlinkat | 2 +- modules/relocatable-prog-wrapper | 1 + modules/renameatu | 2 +- modules/rmdir | 2 +- modules/savewd | 2 +- modules/selinux-at | 2 +- modules/symlinkat | 2 +- modules/unlink | 2 +- modules/unlinkat | 2 +- modules/utimensat | 2 +- 38 files changed, 89 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index b754b5ae40..e4d2b7925d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,55 @@ +2020-03-28 Bruno Haible + + Use module 'filename' instead of module 'dosname'. + + * lib/at-func.c: Include filename.h instead of dosname.h. + * lib/unlinkat.c: Likewise. + * modules/areadlinkat (Depends-on): Add filename. Remove dosname. + * modules/areadlinkat-with-size (Depends-on): Likewise. + * modules/faccessat (Depends-on): Likewise. + * modules/fchmodat (Depends-on): Likewise. + * modules/fchownat (Depends-on): Likewise. + * modules/fstatat (Depends-on): Likewise. + * modules/mkdirat (Depends-on): Likewise. + * modules/mkfifoat (Depends-on): Likewise. + * modules/readlinkat (Depends-on): Likewise. + * modules/selinux-at (Depends-on): Likewise. + * modules/symlinkat (Depends-on): Likewise. + * modules/unlinkat (Depends-on): Likewise. + * modules/utimensat (Depends-on): Likewise. + + * lib/at-func2.c: Include filename.h instead of dosname.h. + * modules/linkat (Depends-on): Add filename. Remove dosname. + * modules/renameatu (Depends-on): Likewise. + + * lib/canonicalize.c: Include filename.h instead of dosname.h. + * lib/canonicalize-lgpl.c: Likewise. + * modules/canonicalize (Depends-on): Add filename. + * modules/canonicalize-lgpl (Depends-on): Likewise. + + * lib/dirname.h: Include filename.h instead of dosname.h. + * modules/dirname-lgpl (Depends-on): Add filename. Remove dosname. + + * lib/fchdir.c: Include filename.h instead of dosname.h. + * modules/fchdir (Depends-on): Add filename. Remove dosname. + + * lib/openat.c: Include filename.h instead of dosname.h. + * modules/openat (Depends-on): Add filename. Remove dosname. + + * lib/rmdir.c: Include filename.h instead of dosname.h. + * modules/rmdir (Depends-on): Add filename. Remove dosname. + + * lib/savewd.c: Include filename.h instead of dosname.h. + * modules/savewd (Depends-on): Add filename. Remove dosname. + + * lib/unlink.c: Include filename.h instead of dosname.h. + * modules/unlink (Depends-on): Add filename. Remove dosname. + + * modules/relocatable-prog-wrapper (Depends-on): Add filename. + * lib/relocwrapper.c: Update comments. + + * modules/lstat (Depends-on): Remove dosname. + 2020-03-28 Bruno Haible dosname: Redirect to 'filename'. diff --git a/lib/at-func.c b/lib/at-func.c index 4a1c909d38..90022e0578 100644 --- a/lib/at-func.c +++ b/lib/at-func.c @@ -16,7 +16,7 @@ /* written by Jim Meyering */ -#include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ +#include "filename.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #ifdef GNULIB_SUPPORT_ONLY_AT_FDCWD # include diff --git a/lib/at-func2.c b/lib/at-func2.c index bc2e2fa1b2..51baf3d12d 100644 --- a/lib/at-func2.c +++ b/lib/at-func2.c @@ -25,7 +25,7 @@ #include #include -#include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ +#include "filename.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #include "filenamecat.h" #include "openat.h" #include "same-inode.h" diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index 7d3c710f10..9f99098839 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -51,7 +51,7 @@ # define __realpath realpath # include "pathmax.h" # include "malloca.h" -# include "dosname.h" +# include "filename.h" # if HAVE_GETCWD # if IN_RELOCWRAPPER /* When building the relocatable program wrapper, use the system's getcwd diff --git a/lib/canonicalize.c b/lib/canonicalize.c index 67fc76ecad..8bb3254149 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -30,7 +30,7 @@ #include "pathmax.h" #include "xalloc.h" #include "xgetcwd.h" -#include "dosname.h" +#include "filename.h" #define MULTIPLE_BITS_SET(i) (((i) & ((i) - 1)) != 0) diff --git a/lib/dirname.h b/lib/dirname.h index 8c12d93b51..5379e8e3d2 100644 --- a/lib/dirname.h +++ b/lib/dirname.h @@ -21,7 +21,7 @@ # include # include -# include "dosname.h" +# include "filename.h" # ifndef DIRECTORY_SEPARATOR # define DIRECTORY_SEPARATOR '/' diff --git a/lib/fchdir.c b/lib/fchdir.c index c27914bbb6..20ecd3c17b 100644 --- a/lib/fchdir.c +++ b/lib/fchdir.c @@ -29,7 +29,7 @@ #include #include "assure.h" -#include "dosname.h" +#include "filename.h" #include "filenamecat.h" #ifndef REPLACE_OPEN_DIRECTORY diff --git a/lib/openat.c b/lib/openat.c index fdbe83f43d..974f1a8b3b 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -167,7 +167,7 @@ rpl_openat (int dfd, char const *filename, int flags, ...) #else /* !HAVE_OPENAT */ -# include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ +# include "filename.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ # include "openat-priv.h" # include "save-cwd.h" diff --git a/lib/relocwrapper.c b/lib/relocwrapper.c index 1b29ac0f14..dfe7e4f1fa 100644 --- a/lib/relocwrapper.c +++ b/lib/relocwrapper.c @@ -24,10 +24,11 @@ -> allocator -> readlink -> stat - -> dosname + -> filename -> pathmax -> verify -> canonicalize-lgpl + -> filename -> malloca -> lstat -> readlink diff --git a/lib/rmdir.c b/lib/rmdir.c index 2f517cc61b..2155224bd6 100644 --- a/lib/rmdir.c +++ b/lib/rmdir.c @@ -23,7 +23,7 @@ #include #include -#include "dosname.h" +#include "filename.h" #undef rmdir diff --git a/lib/savewd.c b/lib/savewd.c index 2cfdf88ce3..2b68e417b8 100644 --- a/lib/savewd.c +++ b/lib/savewd.c @@ -33,8 +33,8 @@ #include #include "assure.h" -#include "dosname.h" #include "fcntl-safer.h" +#include "filename.h" #ifndef FALLTHROUGH # if __GNUC__ < 7 diff --git a/lib/unlink.c b/lib/unlink.c index 5e0f4e177d..35463fd102 100644 --- a/lib/unlink.c +++ b/lib/unlink.c @@ -24,7 +24,7 @@ #include #include -#include "dosname.h" +#include "filename.h" #undef unlink diff --git a/lib/unlinkat.c b/lib/unlinkat.c index 7c0302e27c..442368641a 100644 --- a/lib/unlinkat.c +++ b/lib/unlinkat.c @@ -28,7 +28,7 @@ #include -#include "dosname.h" +#include "filename.h" #include "openat.h" #if HAVE_UNLINKAT diff --git a/modules/areadlinkat b/modules/areadlinkat index a9668cf965..3b36f131f5 100644 --- a/modules/areadlinkat +++ b/modules/areadlinkat @@ -11,11 +11,11 @@ areadlink careadlinkat readlinkat at-internal -dosname errno extensions fchdir fcntl-h +filename openat-die openat-h save-cwd diff --git a/modules/areadlinkat-with-size b/modules/areadlinkat-with-size index 2cdd9595f8..51fb1a87ee 100644 --- a/modules/areadlinkat-with-size +++ b/modules/areadlinkat-with-size @@ -11,11 +11,11 @@ areadlink-with-size stdint readlinkat at-internal -dosname errno extensions fchdir fcntl-h +filename openat-die openat-h save-cwd diff --git a/modules/canonicalize b/modules/canonicalize index b8aadb795b..233fba96f2 100644 --- a/modules/canonicalize +++ b/modules/canonicalize @@ -12,6 +12,7 @@ areadlink-with-size errno extensions file-set +filename hash-triple lstat memmove diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl index ad8c028a51..35264223c8 100644 --- a/modules/canonicalize-lgpl +++ b/modules/canonicalize-lgpl @@ -12,6 +12,7 @@ stdlib nocrash alloca-opt [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] errno [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +filename [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] lstat [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] malloca [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] memmove [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] diff --git a/modules/dirname-lgpl b/modules/dirname-lgpl index 4b48a3e5be..d6c3efd72a 100644 --- a/modules/dirname-lgpl +++ b/modules/dirname-lgpl @@ -9,8 +9,8 @@ lib/stripslash.c m4/dirname.m4 Depends-on: -dosname double-slash-root +filename malloc-posix stdbool diff --git a/modules/faccessat b/modules/faccessat index 170aa7b6b9..b502137c0b 100644 --- a/modules/faccessat +++ b/modules/faccessat @@ -10,10 +10,10 @@ Depends-on: unistd extensions at-internal [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] -dosname [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] errno [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] fchdir [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] fcntl-h [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] +filename [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] fstatat [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] openat-die [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] openat-h [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] diff --git a/modules/fchdir b/modules/fchdir index 6e95e9a18a..eb53d25a4d 100644 --- a/modules/fchdir +++ b/modules/fchdir @@ -12,10 +12,10 @@ chdir [test $HAVE_FCHDIR = 0] close [test $HAVE_FCHDIR = 0] dirent [test $HAVE_FCHDIR = 0] dirfd [test $HAVE_FCHDIR = 0] -dosname [test $HAVE_FCHDIR = 0] dup2 [test $HAVE_FCHDIR = 0] fcntl [test $HAVE_FCHDIR = 0] fcntl-h [test $HAVE_FCHDIR = 0] +filename [test $HAVE_FCHDIR = 0] filenamecat-lgpl [test $HAVE_FCHDIR = 0] fstat [test $HAVE_FCHDIR = 0] getcwd-lgpl [test $HAVE_FCHDIR = 0] diff --git a/modules/fchmodat b/modules/fchmodat index aef184d9bb..83e14abc98 100644 --- a/modules/fchmodat +++ b/modules/fchmodat @@ -10,11 +10,11 @@ Depends-on: sys_stat extensions at-internal [test $HAVE_FCHMODAT = 0] -dosname [test $HAVE_FCHMODAT = 0] errno [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1] extern-inline [test $HAVE_FCHMODAT = 0] fchdir [test $HAVE_FCHMODAT = 0] fcntl-h [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1] +filename [test $HAVE_FCHMODAT = 0] fstatat [test $REPLACE_FCHMODAT = 1] intprops [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1] lchmod [test $HAVE_FCHMODAT = 0] diff --git a/modules/fchownat b/modules/fchownat index d29d77eac5..e14544ab2b 100644 --- a/modules/fchownat +++ b/modules/fchownat @@ -10,11 +10,11 @@ Depends-on: unistd extensions at-internal [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] -dosname [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] errno [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] extern-inline [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] fchdir [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] fcntl-h [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] +filename [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] lchown [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] openat-die [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] openat-h [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] diff --git a/modules/fstatat b/modules/fstatat index 14c3f27fdf..985ea0cda4 100644 --- a/modules/fstatat +++ b/modules/fstatat @@ -11,11 +11,11 @@ Depends-on: sys_stat extensions at-internal [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] -dosname [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] errno [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] extern-inline [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] fchdir [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] fcntl-h [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] +filename [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] lstat [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] openat-die [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] openat-h [test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1] diff --git a/modules/linkat b/modules/linkat index a7cbb9420f..e6f70ffa45 100644 --- a/modules/linkat +++ b/modules/linkat @@ -16,7 +16,7 @@ filenamecat-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] link-follow [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] areadlink [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] at-internal [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] -dosname [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] +filename [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] fstat [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] getcwd-lgpl [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] openat-h [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] diff --git a/modules/lstat b/modules/lstat index a5bff5199d..6173858c0c 100644 --- a/modules/lstat +++ b/modules/lstat @@ -8,7 +8,6 @@ m4/lstat.m4 Depends-on: sys_stat largefile -dosname [test $REPLACE_LSTAT = 1] stat [test $REPLACE_LSTAT = 1] stat-time [test $REPLACE_LSTAT = 1] diff --git a/modules/mkdirat b/modules/mkdirat index 0fe638ae86..7b70a0b7a2 100644 --- a/modules/mkdirat +++ b/modules/mkdirat @@ -10,10 +10,10 @@ Depends-on: sys_stat extensions at-internal [test $HAVE_MKDIRAT = 0] -dosname [test $HAVE_MKDIRAT = 0] errno [test $HAVE_MKDIRAT = 0] fchdir [test $HAVE_MKDIRAT = 0] fcntl-h [test $HAVE_MKDIRAT = 0] +filename [test $HAVE_MKDIRAT = 0] mkdir [test $HAVE_MKDIRAT = 0] openat-die [test $HAVE_MKDIRAT = 0] openat-h [test $HAVE_MKDIRAT = 0] diff --git a/modules/mkfifoat b/modules/mkfifoat index bc0c8e3daf..6c859f3428 100644 --- a/modules/mkfifoat +++ b/modules/mkfifoat @@ -12,10 +12,10 @@ Depends-on: sys_stat extensions at-internal [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] -dosname [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] errno [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] fchdir [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] fcntl-h [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] +filename [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] openat-die [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] openat-h [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] save-cwd [test $HAVE_MKFIFOAT = 0 || test $HAVE_MKNODAT = 0] diff --git a/modules/openat b/modules/openat index 66fa3b4f46..5ff4e4d53b 100644 --- a/modules/openat +++ b/modules/openat @@ -18,9 +18,9 @@ sys_stat [test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1] cloexec [test $REPLACE_OPENAT = 1] fstat [test $REPLACE_OPENAT = 1] at-internal [test $HAVE_OPENAT = 0] -dosname [test $HAVE_OPENAT = 0] errno [test $HAVE_OPENAT = 0] fchdir [test $HAVE_OPENAT = 0] +filename [test $HAVE_OPENAT = 0] open [test $HAVE_OPENAT = 0] openat-die [test $HAVE_OPENAT = 0] save-cwd [test $HAVE_OPENAT = 0] diff --git a/modules/readlinkat b/modules/readlinkat index 84dac40b31..3bc7239657 100644 --- a/modules/readlinkat +++ b/modules/readlinkat @@ -10,10 +10,10 @@ Depends-on: unistd extensions at-internal [test $HAVE_READLINKAT = 0] -dosname [test $HAVE_READLINKAT = 0] errno [test $HAVE_READLINKAT = 0] fchdir [test $HAVE_READLINKAT = 0] fcntl-h [test $HAVE_READLINKAT = 0] +filename [test $HAVE_READLINKAT = 0] openat-die [test $HAVE_READLINKAT = 0] openat-h [test $HAVE_READLINKAT = 0] save-cwd [test $HAVE_READLINKAT = 0] diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper index 25cc66f54a..3cc3d76a45 100644 --- a/modules/relocatable-prog-wrapper +++ b/modules/relocatable-prog-wrapper @@ -37,6 +37,7 @@ Depends-on: alloca-opt double-slash-root errno +filename largefile pathmax ssize_t diff --git a/modules/renameatu b/modules/renameatu index d0a123cf95..5ce8e47587 100644 --- a/modules/renameatu +++ b/modules/renameatu @@ -16,7 +16,7 @@ openat-h [test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1] statat [test $REPLACE_RENAMEAT = 1] stdbool [test $REPLACE_RENAMEAT = 1] at-internal [test $HAVE_RENAMEAT = 0] -dosname [test $HAVE_RENAMEAT = 0] +filename [test $HAVE_RENAMEAT = 0] fstat [test $HAVE_RENAMEAT = 0] getcwd-lgpl [test $HAVE_RENAMEAT = 0] openat-die [test $HAVE_RENAMEAT = 0] diff --git a/modules/rmdir b/modules/rmdir index 59a9dbacc6..85336ba803 100644 --- a/modules/rmdir +++ b/modules/rmdir @@ -7,7 +7,7 @@ m4/rmdir.m4 Depends-on: unistd -dosname [test $REPLACE_RMDIR = 1] +filename [test $REPLACE_RMDIR = 1] sys_stat [test $REPLACE_RMDIR = 1] configure.ac: diff --git a/modules/savewd b/modules/savewd index a6c82672fb..935540cbd9 100644 --- a/modules/savewd +++ b/modules/savewd @@ -9,12 +9,12 @@ m4/savewd.m4 Depends-on: assure chdir -dosname errno extern-inline fchdir fcntl-safer fcntl-h +filename raise stdbool stdlib diff --git a/modules/selinux-at b/modules/selinux-at index 29d188e1aa..4de98a6102 100644 --- a/modules/selinux-at +++ b/modules/selinux-at @@ -9,11 +9,11 @@ lib/at-func.c Depends-on: selinux-h at-internal -dosname errno extensions fchdir fcntl-h +filename openat-die openat-h save-cwd diff --git a/modules/symlinkat b/modules/symlinkat index 3d1f2ac269..16d0fcc2be 100644 --- a/modules/symlinkat +++ b/modules/symlinkat @@ -10,10 +10,10 @@ Depends-on: unistd extensions at-internal [test $HAVE_SYMLINKAT = 0] -dosname [test $HAVE_SYMLINKAT = 0] errno [test $HAVE_SYMLINKAT = 0] fchdir [test $HAVE_SYMLINKAT = 0] fcntl-h [test $HAVE_SYMLINKAT = 0] +filename [test $HAVE_SYMLINKAT = 0] openat-die [test $HAVE_SYMLINKAT = 0] openat-h [test $HAVE_SYMLINKAT = 0] save-cwd [test $HAVE_SYMLINKAT = 0] diff --git a/modules/unlink b/modules/unlink index 5fc84d935c..9e57184905 100644 --- a/modules/unlink +++ b/modules/unlink @@ -7,7 +7,7 @@ m4/unlink.m4 Depends-on: unistd -dosname [test $REPLACE_UNLINK = 1] +filename [test $REPLACE_UNLINK = 1] lstat [test $REPLACE_UNLINK = 1] malloc-posix [test $REPLACE_UNLINK = 1] diff --git a/modules/unlinkat b/modules/unlinkat index f2094e0db9..b379a90354 100644 --- a/modules/unlinkat +++ b/modules/unlinkat @@ -15,9 +15,9 @@ openat-h [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1] sys_stat [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1] statat [test $REPLACE_UNLINKAT = 1] at-internal [test $HAVE_UNLINKAT = 0] -dosname [test $HAVE_UNLINKAT = 0] errno [test $HAVE_UNLINKAT = 0] fchdir [test $HAVE_UNLINKAT = 0] +filename [test $HAVE_UNLINKAT = 0] openat-die [test $HAVE_UNLINKAT = 0] rmdir [test $HAVE_UNLINKAT = 0] save-cwd [test $HAVE_UNLINKAT = 0] diff --git a/modules/utimensat b/modules/utimensat index 27e4679dac..1d8895f9f8 100644 --- a/modules/utimensat +++ b/modules/utimensat @@ -10,10 +10,10 @@ Depends-on: sys_stat extensions at-internal [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] -dosname [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] errno [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] fchdir [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] fcntl-h [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] +filename [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] openat-die [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] openat-h [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] save-cwd [test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1] -- 2.39.5