diff options
| -rw-r--r-- | winsup/cygwin/dir.cc | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index b757851d5..29a9dfa83 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 */; |