diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2019-01-07 19:36:37 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2019-01-07 19:36:37 +0100 |
| commit | 9443efe0990ad32c1896717ac7c38ff9c8c57073 (patch) | |
| tree | c66ed7da760b89410ba39a782ed17b9e28aeae96 | |
| parent | b93022a82dc523bcb731c2f69fb6e602c79060b5 (diff) | |
| download | cygnal-9443efe0990ad32c1896717ac7c38ff9c8c57073.tar.gz cygnal-9443efe0990ad32c1896717ac7c38ff9c8c57073.tar.bz2 cygnal-9443efe0990ad32c1896717ac7c38ff9c8c57073.zip | |
Cygwin: linkat: support Linux-specific AT_EMPTY_PATH flag
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | newlib/libc/include/sys/_default_fcntl.h | 1 | ||||
| -rw-r--r-- | winsup/cygwin/release/2.12.0 | 2 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 20 | ||||
| -rw-r--r-- | winsup/doc/new-features.xml | 4 |
4 files changed, 25 insertions, 2 deletions
diff --git a/newlib/libc/include/sys/_default_fcntl.h b/newlib/libc/include/sys/_default_fcntl.h index 2dc0068c9..0647e590f 100644 --- a/newlib/libc/include/sys/_default_fcntl.h +++ b/newlib/libc/include/sys/_default_fcntl.h @@ -166,6 +166,7 @@ extern "C" { #define AT_SYMLINK_NOFOLLOW 2 #define AT_SYMLINK_FOLLOW 4 #define AT_REMOVEDIR 8 +#define AT_EMPTY_PATH 16 #endif #if __BSD_VISIBLE diff --git a/winsup/cygwin/release/2.12.0 b/winsup/cygwin/release/2.12.0 index c9e63a6ba..81a55b58d 100644 --- a/winsup/cygwin/release/2.12.0 +++ b/winsup/cygwin/release/2.12.0 @@ -22,6 +22,8 @@ What's new: - Support Linux-specific open(2) flag O_PATH. +- Support Linux-specific linkat(2) flag AT_EMPTY_PATH. + What changed: ------------- diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index d6f81cab9..cb62a6242 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -4812,13 +4812,29 @@ linkat (int olddirfd, const char *oldpathname, tmp_pathbuf tp; __try { - if (flags & ~AT_SYMLINK_FOLLOW) + if (flags & ~(AT_SYMLINK_FOLLOW | AT_EMPTY_PATH)) { set_errno (EINVAL); __leave; } char *oldpath = tp.c_get (); - if (gen_full_path_at (oldpath, olddirfd, oldpathname)) + /* AT_EMPTY_PATH with an empty oldpathname is equivalent to + + linkat(AT_FDCWD, "/proc/self/fd/<olddirfd>", newdirfd, + newname, AT_SYMLINK_FOLLOW); + + Convert the request accordingly. */ + if ((flags & AT_EMPTY_PATH) && oldpathname && oldpathname[0] == '\0') + { + if (olddirfd == AT_FDCWD) + { + set_errno (EPERM); + __leave; + } + __small_sprintf (oldpath, "/proc/%d/fd/%d", myself->pid, olddirfd); + flags = AT_SYMLINK_FOLLOW; + } + else if (gen_full_path_at (oldpath, olddirfd, oldpathname)) __leave; char *newpath = tp.c_get (); if (gen_full_path_at (newpath, newdirfd, newpathname)) diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml index b55e031bc..f84a9c443 100644 --- a/winsup/doc/new-features.xml +++ b/winsup/doc/new-features.xml @@ -42,6 +42,10 @@ Support Linux-specific open(2) flag O_PATH. </para></listitem> <listitem><para> +- Support Linux-specific linkat(2) flag AT_EMPTY_PATH. +</para></listitem> + +<listitem><para> clock_nanosleep, pthread_condattr_setclock and timer_create now support all clocks, except CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID. </para></listitem> |