drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* errno.cc (errmap): Add ERROR_TOO_MANY_LINKS -> EMLINK mapping. 

* syscalls.cc (link): Only copy files if FS doesn't support hard links.
This commit is contained in:
Corinna Vinschen 2004-08-03 14:37:26 +00:00
parent 8c97671600
commit 3410b5be3e
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2004-08-03 Corinna Vinschen <corinna@vinschen.de>
* errno.cc (errmap): Add ERROR_TOO_MANY_LINKS -> EMLINK mapping.
* syscalls.cc (link): Only copy files if FS doesn't support hard links.
2004-07-26 Christopher January <chris@atomice.net>
* fhandler_proc.cc (format_proc_cpuinfo): Remove Intel-specific flags

1
winsup/cygwin/errno.cc
View File

@ -120,6 +120,7 @@ static NO_COPY struct
X (DEVICE_REQUIRES_CLEANING, EIO),
X (DEVICE_DOOR_OPEN, EIO),
X (IO_PENDING, EAGAIN),
X (TOO_MANY_LINKS, EMLINK),
{ 0, NULL, 0}
};

41
winsup/cygwin/syscalls.cc
View File

@ -707,6 +707,24 @@ link (const char *a, const char *b)
if (CreateHardLinkA (real_b, real_a, NULL))
goto success;
/* There are two cases to consider:
- The FS doesn't support hard links ==> ERROR_INVALID_FUNCTION
We copy the file.
- CreateHardLinkA is not supported ==> ERROR_PROC_NOT_FOUND
In that case (<= NT4) we try the old-style method.
Any other error should be taken seriously. */
if (GetLastError () == ERROR_INVALID_FUNCTION)
{
syscall_printf ("FS doesn't support hard links: Copy file");
goto docopy;
}
if (GetLastError () != ERROR_PROC_NOT_FOUND)
{
syscall_printf ("CreateHardLinkA failed");
__seterrno ();
goto done;
}
HANDLE hFileSource;
WIN32_STREAM_ID StreamId;
@ -717,6 +735,7 @@ link (const char *a, const char *b)
WCHAR wbuf[CYG_MAX_PATH];
BOOL bSuccess;
DWORD write_err;
hFileSource = CreateFile (real_a, FILE_WRITE_ATTRIBUTES,
FILE_SHARE_READ | FILE_SHARE_WRITE /*| FILE_SHARE_DELETE*/,
@ -767,7 +786,10 @@ link (const char *a, const char *b)
);
if (!bSuccess)
syscall_printf ("cannot write linkname, %E");
{
write_err = GetLastError ();
syscall_printf ("cannot write linkname, %E");
}
/* Free context */
BackupWrite (
@ -780,12 +802,25 @@ link (const char *a, const char *b)
&lpContext);
}
else
syscall_printf ("cannot write streamId, %E");
{
write_err = GetLastError ();
syscall_printf ("cannot write streamId, %E");
}
CloseHandle (hFileSource);
if (!bSuccess)
goto docopy;
{
/* Only copy file if FS doesn't support hard links */
if (write_err == ERROR_INVALID_FUNCTION)
{
syscall_printf ("FS doesn't support hard links: Copy file");
goto docopy;
}
__seterrno_from_win_error (write_err);
goto done;
}
success:
res = 0;