* bootstrap.conf, src/copy.c, src/mv.c, src/shred.c: Adjust to renaming of renameat2 to renameatu. --- bootstrap.conf | 2 +- gnulib | 2 +- src/copy.c | 4 ++-- src/mv.c | 4 ++-- src/shred.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf index 4da4f9415..fcf29dc23 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -210,7 +210,7 @@ gnulib_modules=" remove rename renameat - renameat2 + renameatu rmdir root-dev-ino rpmatch diff --git a/gnulib b/gnulib index 16aa5a2ef..2522322e5 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 16aa5a2efe82e01a147b4022258fa9a272f67625 +Subproject commit 2522322e5304e7d86c63e607e2bc83c8d8b0a889 diff --git a/src/copy.c b/src/copy.c index 58d2f6eb6..1a9cdd1a8 100644 --- a/src/copy.c +++ b/src/copy.c @@ -53,7 +53,7 @@ #include "ignore-value.h" #include "ioblksize.h" #include "quote.h" -#include "renameat2.h" +#include "renameatu.h" #include "root-uid.h" #include "same.h" #include "savedir.h" @@ -1873,7 +1873,7 @@ copy_internal (char const *src_name, char const *dst_name, if (x->move_mode) { if (rename_errno < 0) - rename_errno = (renameat2 (AT_FDCWD, src_name, AT_FDCWD, dst_name, + rename_errno = (renameatu (AT_FDCWD, src_name, AT_FDCWD, dst_name, RENAME_NOREPLACE) ? errno : 0); new_dst = rename_errno == 0; diff --git a/src/mv.c b/src/mv.c index b6dd72d67..36fd1af4b 100644 --- a/src/mv.c +++ b/src/mv.c @@ -31,7 +31,7 @@ #include "error.h" #include "filenamecat.h" #include "remove.h" -#include "renameat2.h" +#include "renameatu.h" #include "root-dev-ino.h" #include "priv-set.h" @@ -456,7 +456,7 @@ main (int argc, char **argv) { assert (2 <= n_files); if (n_files == 2) - x.rename_errno = (renameat2 (AT_FDCWD, file[0], AT_FDCWD, file[1], + x.rename_errno = (renameatu (AT_FDCWD, file[0], AT_FDCWD, file[1], RENAME_NOREPLACE) ? errno : 0); if (x.rename_errno != 0 && target_directory_operand (file[n_files - 1])) diff --git a/src/shred.c b/src/shred.c index 2ddaadd38..270b1e942 100644 --- a/src/shred.c +++ b/src/shred.c @@ -93,7 +93,7 @@ #include "human.h" #include "randint.h" #include "randread.h" -#include "renameat2.h" +#include "renameatu.h" #include "stat-size.h" /* Default number of times to overwrite. */ @@ -1096,7 +1096,7 @@ wipename (char *oldname, char const *qoldname, struct Options const *flags) memset (base, nameset[0], len); base[len] = 0; bool rename_ok; - while (! (rename_ok = (renameat2 (AT_FDCWD, oldname, AT_FDCWD, newname, + while (! (rename_ok = (renameatu (AT_FDCWD, oldname, AT_FDCWD, newname, RENAME_NOREPLACE) == 0)) && errno == EEXIST && incname (base, len)) -- 2.17.1