From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 71467 invoked by alias); 25 Sep 2019 00:05:40 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 71447 invoked by uid 9996); 25 Sep 2019 00:05:40 -0000 Date: Wed, 25 Sep 2019 00:05:00 -0000 Message-ID: <20190925000540.71446.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: rmdir: fail if last component is a symlink, as on Linux X-Act-Checkin: newlib-cygwin X-Git-Author: Ken Brown X-Git-Refname: refs/heads/master X-Git-Oldrev: 9f24260ee90bec2506ae5c624dc06ab3fc67ae64 X-Git-Newrev: d1b5feef8232e82a0f31e5ed421abda84c3f4705 X-SW-Source: 2019-q3/txt/msg00088.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d1b5feef8232e82a0f31e5ed421abda84c3f4705 commit d1b5feef8232e82a0f31e5ed421abda84c3f4705 Author: Ken Brown Date: Sun Sep 22 11:33:34 2019 -0400 Cygwin: rmdir: fail if last component is a symlink, as on Linux If the last component of the directory name is a symlink followed by a slash, rmdir now fails, following Linux but not POSIX, even if the symlink resolves to an existing empty directory. mkdir was similarly changed in 2009 in commit 52dba6a5c45e8d8ba1e237a15213311dc11d91fb. Modify a comment to clarify the purpose of that commit. Addresses https://cygwin.com/ml/cygwin/2019-09/msg00221.html. Diff: --- winsup/cygwin/dir.cc | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index b757851..29a9dfa 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -305,15 +305,15 @@ mkdir (const char *dir, mode_t mode) __try { - /* POSIX says mkdir("symlink-to-missing/") should create the - directory "missing", but Linux rejects it with EEXIST. Copy - Linux behavior for now. */ - if (!*dir) { set_errno (ENOENT); __leave; } + /* Following Linux, and intentionally ignoring POSIX, do not + resolve the last component of DIR if it is a symlink, even if + DIR has a trailing slash. Achieve this by stripping trailing + slashes or backslashes. */ if (isdirsep (dir[strlen (dir) - 1])) { /* This converts // to /, but since both give EEXIST, we're okay. */ @@ -351,9 +351,30 @@ rmdir (const char *dir) { int res = -1; fhandler_base *fh = NULL; + tmp_pathbuf tp; __try { + if (!*dir) + { + set_errno (ENOENT); + __leave; + } + + /* Following Linux, and intentionally ignoring POSIX, do not + resolve the last component of DIR if it is a symlink, even if + DIR has a trailing slash. Achieve this by stripping trailing + slashes or backslashes. */ + if (isdirsep (dir[strlen (dir) - 1])) + { + /* This converts // to /, but since both give ENOTEMPTY, + we're okay. */ + char *buf; + char *p = stpcpy (buf = tp.c_get (), dir) - 1; + dir = buf; + while (p > dir && isdirsep (*p)) + *p-- = '\0'; + } if (!(fh = build_fh_name (dir, PC_SYM_NOFOLLOW))) __leave; /* errno already set */;