public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/cygwin-3_4-branch] Cygwin: align renameat2 to Linux behaviour
@ 2023-04-18 16:19 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2023-04-18 16:19 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7b3b2c201a271c5dcddcd3060f58d841478d47d9
commit 7b3b2c201a271c5dcddcd3060f58d841478d47d9
Author: Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Tue Apr 18 18:18:27 2023 +0200
Commit: Corinna Vinschen <corinna@vinschen.de>
CommitDate: Tue Apr 18 18:18:39 2023 +0200
Cygwin: align renameat2 to Linux behaviour
In contrast to rename default behaviour, Linux' renameat2 returns -1
with errno set to EEXIST, if oldfile and newfile refer to the same
file, and the RENAME_NOREPLACE flag is set.
Follow suit, given this is a Linux-only function anyway.
Fixes: f665b1cef30f ("cygwin: Implement renameat2")
Reported-by: Bruno Haible <bruno@clisp.org>
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/release/3.4.7 | 4 ++++
winsup/cygwin/syscalls.cc | 18 +++++++++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/winsup/cygwin/release/3.4.7 b/winsup/cygwin/release/3.4.7
index 7bc7d4a1ccdb..0e6922163aa3 100644
--- a/winsup/cygwin/release/3.4.7
+++ b/winsup/cygwin/release/3.4.7
@@ -21,3 +21,7 @@ Bug Fixes
- Fix error handling in readlinkat.
Addresses: https://cygwin.com/pipermail/cygwin/2023-April/253510.html
+
+- Fix return code and errno set by renameat2, if oldfile and newfile
+ refer to the same file, and the RENAME_NOREPLACE flag is set.
+ Addresses: https://cygwin.com/pipermail/cygwin/2023-April/253514.html
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index a4e4af626db1..5adc614ec30f 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -2122,6 +2122,14 @@ nt_path_has_executable_suffix (PUNICODE_STRING upath)
return false;
}
+inline int
+set_same_file_return (bool noreplace)
+{
+ if (!noreplace)
+ return 0;
+ set_errno (EEXIST);
+ return -1;
+}
/* If newpath names an existing file and the RENAME_NOREPLACE flag is
specified, fail with EEXIST. Exception: Don't fail if the purpose
of the rename is just to change the case of oldpath on a
@@ -2300,7 +2308,7 @@ rename2 (const char *oldpath, const char *newpath, unsigned int at2flags)
newpc.get_nt_native_path (),
FALSE))
{
- res = 0;
+ res = set_same_file_return (noreplace);
__leave;
}
newpc.file_attributes (INVALID_FILE_ATTRIBUTES);
@@ -2315,7 +2323,7 @@ rename2 (const char *oldpath, const char *newpath, unsigned int at2flags)
if (newpc.get_nt_native_path ()->Length
== oldpc.get_nt_native_path ()->Length)
{
- res = 0;
+ res = set_same_file_return (noreplace);
__leave;
}
if (*(PWCHAR) ((PBYTE) newpc.get_nt_native_path ()->Buffer
@@ -2335,7 +2343,7 @@ rename2 (const char *oldpath, const char *newpath, unsigned int at2flags)
newpc.get_nt_native_path (),
oldpc.objcaseinsensitive ()))
{
- res = 0;
+ res = set_same_file_return (noreplace);
__leave;
}
}
@@ -2364,7 +2372,7 @@ rename2 (const char *oldpath, const char *newpath, unsigned int at2flags)
newpc.get_nt_native_path (),
oldpc.objcaseinsensitive ()))
{
- res = 0;
+ res = set_same_file_return (noreplace);
__leave;
}
}
@@ -2582,7 +2590,7 @@ skip_pre_W10_checks:
{
debug_printf ("%s and %s are the same file", oldpath, newpath);
NtClose (nfh);
- res = 0;
+ res = set_same_file_return (noreplace);
__leave;
}
NtClose (nfh);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-18 16:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-18 16:19 [newlib-cygwin/cygwin-3_4-branch] Cygwin: align renameat2 to Linux behaviour Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).