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

* syscalls.cc (_rename): Handle the case that `foo' is renamed to

Browse Source 
`bar' while `bar.lnk' is an existing shortcut-symlink.
This commit is contained in:
Corinna Vinschen
2001-06-01 11:53:20 +00:00
parent 9e3b6f5411
commit bc28fe9599
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
Fri Jun 1 13:45:00 2001 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (_rename): Handle the case that `foo' is renamed to
`bar' while `bar.lnk' is an existing shortcut-symlink.
Thu May 31 15:57:57 2001 Christopher Faylor <cgf@cygnus.com>
* fhandler.cc (fhandler_disk_file::fstat): Avoid clearing S_IFMT bits

36
winsup/cygwin/syscalls.cc
View File

@@ -1228,6 +1228,7 @@ _rename (const char *oldpath, const char *newpath)
{
sigframe thisframe (mainthread);
int res = 0;
char *lnk_suffix = NULL;
path_conv real_old (oldpath, PC_SYM_NOFOLLOW);
@@ -1276,13 +1277,18 @@ _rename (const char *oldpath, const char *newpath)
return (-1);
}
/* Destination file exists and is read only, change that or else
the rename won't work. */
if (real_new.file_attributes () != (DWORD) -1 &&
real_new.file_attributes () & FILE_ATTRIBUTE_READONLY)
{
/* Destination file exists and is read only, change that or else
the rename won't work. */
SetFileAttributesA (real_new.get_win32 (), real_new.file_attributes () & ~ FILE_ATTRIBUTE_READONLY);
}
SetFileAttributesA (real_new.get_win32 (),
real_new.file_attributes () & ~FILE_ATTRIBUTE_READONLY);
/* Shortcut hack No. 2, part 1 */
if (!real_old.issymlink () && !real_new.error && real_new.issymlink () &&
real_new.known_suffix && strcasematch (real_new.known_suffix, ".lnk") &&
(lnk_suffix = strrchr (real_new.get_win32 (), '.')))
*lnk_suffix = '\0';
if (!MoveFile (real_old.get_win32 (), real_new.get_win32 ()))
res = -1;
@@ -1322,12 +1328,26 @@ _rename (const char *oldpath, const char *newpath)
done:
if (res)
__seterrno ();
if (res == 0)
{
__seterrno ();
/* Reset R/O attributes if neccessary. */
if (real_new.file_attributes () != (DWORD) -1 &&
real_new.file_attributes () & FILE_ATTRIBUTE_READONLY)
SetFileAttributesA (real_new.get_win32 (), real_new.file_attributes ());
}
else
{
/* make the new file have the permissions of the old one */
SetFileAttributesA (real_new.get_win32 (), real_old.file_attributes ());
/* Shortcut hack, No. 2, part 2 */
/* if the new filename was an existing shortcut, remove it now if the
new filename is equal to the shortcut name without .lnk suffix. */
if (lnk_suffix)
{
*lnk_suffix = '.';
DeleteFile (real_new.get_win32 ());
}
}
syscall_printf ("%d = rename (%s, %s)", res, real_old.get_win32 (),