JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* syscalls.cc (rename): Fix regression in rename("dir","d/").

Browse Source
This commit is contained in:
Eric Blake 2009-09-30 02:11:05 +00:00
parent e634d38754
commit 1c0909882c
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2009-09-29 Eric Blake <ebb9@byu.net>
* syscalls.cc (rename): Fix regression in rename("dir","d/").
2009-09-29 Corinna Vinschen <corinna@vinschen.de> 2009-09-29 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::recv_internal): Always call * fhandler_socket.cc (fhandler_socket::recv_internal): Always call

21
winsup/cygwin/syscalls.cc
View File

@ -1668,17 +1668,20 @@ rename (const char *oldpath, const char *newpath)
if (!*oldpath || !*newpath) if (!*oldpath || !*newpath)
{ {
/* Reject rename("","x"), rename("x",""). */
set_errno (ENOENT); set_errno (ENOENT);
goto out; goto out;
} }
if (has_dot_last_component (oldpath, true)) if (has_dot_last_component (oldpath, true))
{ {
/* Reject rename("dir/.","x"). */
oldpc.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes); oldpc.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes);
set_errno (oldpc.isdir () ? EINVAL : ENOTDIR); set_errno (oldpc.isdir () ? EINVAL : ENOTDIR);
goto out; goto out;
} }
if (has_dot_last_component (newpath, true)) if (has_dot_last_component (newpath, true))
{ {
/* Reject rename("dir","x/."). */
newpc.check (newpath, PC_SYM_NOFOLLOW, stat_suffixes); newpc.check (newpath, PC_SYM_NOFOLLOW, stat_suffixes);
set_errno (!newpc.exists () ? ENOENT : newpc.isdir () ? EINVAL : ENOTDIR); set_errno (!newpc.exists () ? ENOENT : newpc.isdir () ? EINVAL : ENOTDIR);
goto out; goto out;
@ -1724,6 +1727,7 @@ rename (const char *oldpath, const char *newpath)
} }
if (old_dir_requested && !oldpc.isdir ()) if (old_dir_requested && !oldpc.isdir ())
{ {
/* Reject rename("file/","x"). */
set_errno (ENOTDIR); set_errno (ENOTDIR);
goto out; goto out;
} }
@ -1759,21 +1763,16 @@ rename (const char *oldpath, const char *newpath)
set_errno (EROFS); set_errno (EROFS);
goto out; goto out;
} }
if (new_dir_requested) if (new_dir_requested && !(newpc.exists ()
? newpc.isdir () : oldpc.isdir ()))
{ {
if (!newpc.exists()) /* Reject rename("file1","file2/"), but allow rename("dir","d/"). */
{ set_errno (newpc.exists () ? ENOTDIR : ENOENT);
set_errno (ENOENT); goto out;
goto out;
}
if (!newpc.isdir ())
{
set_errno (ENOTDIR);
goto out;
}
} }
if (newpc.exists () && (oldpc.isdir () ? !newpc.isdir () : newpc.isdir ())) if (newpc.exists () && (oldpc.isdir () ? !newpc.isdir () : newpc.isdir ()))
{ {
/* Reject rename("file","dir") and rename("dir","file"). */
set_errno (newpc.isdir () ? EISDIR : ENOTDIR); set_errno (newpc.isdir () ? EISDIR : ENOTDIR);
goto out; goto out;
} }