From 136b0dfd53e147002e134048658d20f452402c9f Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Thu, 17 Aug 2017 09:12:15 -0400 Subject: [PATCH] cygwin: Implement renameat2 Define the RENAME_NOREPLACE flag in as defined on Linux in . The other RENAME_* flags defined on Linux are not supported. --- newlib/libc/include/stdio.h | 3 +++ winsup/cygwin/common.din | 1 + winsup/cygwin/include/cygwin/fs.h | 6 +++++ winsup/cygwin/include/cygwin/version.h | 3 ++- winsup/cygwin/syscalls.cc | 41 +++++++++++++++++++++++++++++----- 5 files changed, 48 insertions(+), 6 deletions(-) diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h index 5d8cb1092..331a1cf07 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -384,6 +384,9 @@ int _EXFUN(vdprintf, (int, const char *__restrict, __VALIST) #endif #if __ATFILE_VISIBLE int _EXFUN(renameat, (int, const char *, int, const char *)); +# ifdef __CYGWIN__ +int _EXFUN(renameat2, (int, const char *, int, const char *, unsigned int)); +# endif #endif /* diff --git a/winsup/cygwin/common.din b/winsup/cygwin/common.din index 8da432b8a..ca6ff3cf9 100644 --- a/winsup/cygwin/common.din +++ b/winsup/cygwin/common.din @@ -1168,6 +1168,7 @@ remquof NOSIGFE remquol NOSIGFE rename SIGFE renameat SIGFE +renameat2 SIGFE res_close = __res_close SIGFE res_init = __res_init SIGFE res_mkquery = __res_mkquery SIGFE diff --git a/winsup/cygwin/include/cygwin/fs.h b/winsup/cygwin/include/cygwin/fs.h index f606ffc39..48b0cca45 100644 --- a/winsup/cygwin/include/cygwin/fs.h +++ b/winsup/cygwin/include/cygwin/fs.h @@ -19,4 +19,10 @@ details. */ #define BLKPBSZGET 0x0000127b #define BLKGETSIZE64 0x00041268 +/* Flags for renameat2, from /usr/include/linux/fs.h. For now we + support only RENAME_NOREPLACE. */ +#define RENAME_NOREPLACE (1 << 0) +/* #define RENAME_EXCHANGE (1 << 1) */ +/* #define RENAME_WHITEOUT (1 << 2) */ + #endif diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index efd4ac017..0384f77da 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -481,12 +481,13 @@ details. */ 314: Export explicit_bzero. 315: Export pthread_mutex_timedlock. 316: Export pthread_rwlock_timedrdlock, pthread_rwlock_timedwrlock. + 317: Export renameat2. Add RENAME_NOREPLACE. Note that we forgot to bump the api for ualarm, strtoll, strtoull, sigaltstack, sethostname. */ #define CYGWIN_VERSION_API_MAJOR 0 -#define CYGWIN_VERSION_API_MINOR 316 +#define CYGWIN_VERSION_API_MINOR 317 /* There is also a compatibity version number associated with the shared memory regions. It is incremented when incompatible changes are made to the shared diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 885931632..d756f5f35 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -60,6 +60,7 @@ details. */ #include "tls_pbuf.h" #include "sync.h" #include "child_info.h" +#include /* needed for RENAME_NOREPLACE */ #undef _close #undef _lseek @@ -2048,8 +2049,12 @@ nt_path_has_executable_suffix (PUNICODE_STRING upath) return false; } -extern "C" int -rename (const char *oldpath, const char *newpath) +/* 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 + case-insensitive file system. */ +static int +rename2 (const char *oldpath, const char *newpath, unsigned int flags) { tmp_pathbuf tp; int res = -1; @@ -2068,6 +2073,12 @@ rename (const char *oldpath, const char *newpath) __try { + if (flags & ~RENAME_NOREPLACE) + /* RENAME_NOREPLACE is the only flag currently supported. */ + { + set_errno (ENOTSUP); + __leave; + } if (!*oldpath || !*newpath) { /* Reject rename("","x"), rename("x",""). */ @@ -2337,6 +2348,13 @@ rename (const char *oldpath, const char *newpath) __leave; } + /* Should we replace an existing file? */ + if ((removepc || dstpc->exists ()) && (flags & RENAME_NOREPLACE)) + { + set_errno (EEXIST); + __leave; + } + /* Opening the file must be part of the transaction. It's not sufficient to call only NtSetInformationFile under the transaction. Therefore we have to start the transaction here, if necessary. */ @@ -2578,6 +2596,12 @@ rename (const char *oldpath, const char *newpath) return res; } +extern "C" int +rename (const char *oldpath, const char *newpath) +{ + return rename2 (oldpath, newpath, 0); +} + extern "C" int system (const char *cmdstring) { @@ -4719,8 +4743,8 @@ readlinkat (int dirfd, const char *__restrict pathname, char *__restrict buf, } extern "C" int -renameat (int olddirfd, const char *oldpathname, - int newdirfd, const char *newpathname) +renameat2 (int olddirfd, const char *oldpathname, + int newdirfd, const char *newpathname, unsigned int flags) { tmp_pathbuf tp; __try @@ -4731,13 +4755,20 @@ renameat (int olddirfd, const char *oldpathname, char *newpath = tp.c_get (); if (gen_full_path_at (newpath, newdirfd, newpathname)) __leave; - return rename (oldpath, newpath); + return rename2 (oldpath, newpath, flags); } __except (EFAULT) {} __endtry return -1; } +extern "C" int +renameat (int olddirfd, const char *oldpathname, + int newdirfd, const char *newpathname) +{ + return renameat2 (olddirfd, oldpathname, newdirfd, newpathname, 0); +} + extern "C" int scandirat (int dirfd, const char *pathname, struct dirent ***namelist, int (*select) (const struct dirent *), -- 2.14.1