From: Ken Brown Date: Fri, 27 Dec 2019 22:17:35 +0000 (-0500) Subject: Cygwin: readlinkat: allow pathname to be empty X-Git-Tag: newlib-3.3.0~12 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=6cc05784e16af56750417b73d778efb09c3b122e;p=newlib-cygwin.git Cygwin: readlinkat: allow pathname to be empty Following Linux, allow the pathname argument to be an empty string, provided the dirfd argument refers to a symlink opened with O_PATH | O_NOFOLLOW. The readlinkat call then operates on that symlink. --- diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 038a316db..282d9e0ee 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -4979,8 +4979,23 @@ readlinkat (int dirfd, const char *__restrict pathname, char *__restrict buf, __try { char *path = tp.c_get (); - if (gen_full_path_at (path, dirfd, pathname)) - __leave; + int res = gen_full_path_at (path, dirfd, pathname); + if (res) + { + if (errno != ENOENT) + __leave; + /* pathname is an empty string. This is OK if dirfd refers + to a symlink that was opened with O_PATH | O_NOFOLLOW. + In this case, readlinkat operates on the symlink. */ + cygheap_fdget cfd (dirfd); + if (cfd < 0) + __leave; + if (!(cfd->issymlink () + && cfd->get_flags () & O_PATH + && cfd->get_flags () & O_NOFOLLOW)) + __leave; + strcpy (path, cfd->get_name ()); + } return readlink (path, buf, bufsize); } __except (EFAULT) {}