mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-10 05:03:06 +03:00
hurd: Make rename refuse trailing slashes [BZ #32570]
As tested by Gnulib's renameatu module. Reported by Collin Funk on https://sourceware.org/bugzilla/show_bug.cgi?id=32570
This commit is contained in:
@@ -37,15 +37,28 @@ __renameat2 (int oldfd, const char *old, int newfd, const char *new,
|
|||||||
if (flags & RENAME_NOREPLACE)
|
if (flags & RENAME_NOREPLACE)
|
||||||
excl = 1;
|
excl = 1;
|
||||||
|
|
||||||
olddir = __directory_name_split_at (oldfd, old, (char **) &oldname);
|
olddir = __file_name_split_at (oldfd, old, (char **) &oldname);
|
||||||
if (olddir == MACH_PORT_NULL)
|
if (olddir == MACH_PORT_NULL)
|
||||||
return -1;
|
return -1;
|
||||||
newdir = __directory_name_split_at (newfd, new, (char **) &newname);
|
if (!*oldname)
|
||||||
|
{
|
||||||
|
/* Trailing slash. */
|
||||||
|
__mach_port_deallocate (__mach_task_self (), olddir);
|
||||||
|
return __hurd_fail (ENOTDIR);
|
||||||
|
}
|
||||||
|
newdir = __file_name_split_at (newfd, new, (char **) &newname);
|
||||||
if (newdir == MACH_PORT_NULL)
|
if (newdir == MACH_PORT_NULL)
|
||||||
{
|
{
|
||||||
__mach_port_deallocate (__mach_task_self (), olddir);
|
__mach_port_deallocate (__mach_task_self (), olddir);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
if (!*newname)
|
||||||
|
{
|
||||||
|
/* Trailing slash. */
|
||||||
|
__mach_port_deallocate (__mach_task_self (), olddir);
|
||||||
|
__mach_port_deallocate (__mach_task_self (), newdir);
|
||||||
|
return __hurd_fail (ENOTDIR);
|
||||||
|
}
|
||||||
|
|
||||||
err = __dir_rename (olddir, oldname, newdir, newname, excl);
|
err = __dir_rename (olddir, oldname, newdir, newname, excl);
|
||||||
__mach_port_deallocate (__mach_task_self (), olddir);
|
__mach_port_deallocate (__mach_task_self (), olddir);
|
||||||
|
Reference in New Issue
Block a user