if (flags & RENAME_NOREPLACE)
excl = 1;
- olddir = __file_name_split_at (oldfd, old, (char **) &oldname);
+ olddir = __directory_name_split_at (oldfd, old, (char **) &oldname);
if (olddir == MACH_PORT_NULL)
return -1;
- if (!*oldname)
- {
- /* Trailing slash. */
- __mach_port_deallocate (__mach_task_self (), olddir);
- return __hurd_fail (ENOTDIR);
- }
- newdir = __file_name_split_at (newfd, new, (char **) &newname);
+ newdir = __directory_name_split_at (newfd, new, (char **) &newname);
if (newdir == MACH_PORT_NULL)
{
- __mach_port_deallocate (__mach_task_self (), olddir);
+ __mach_port_deallocate (__mach_task_self (), olddir);
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);
__mach_port_deallocate (__mach_task_self (), olddir);