Skip to content

Commit 83c2abb

Browse files
kbleesdscho
authored andcommitted
Allow native symlinks to non-existing targets in 'nativestrict' mode
Windows native symlinks must match the type of their target (file or directory), otherwise native Windows tools will fail. Creating symlinks in 'nativestrict' mode currently requires the target to exist in order to check its type. However, the target of a symlink can change at any time after the symlink has been created. Thus users of native symlinks must be prepared to deal with type mismatches anyway. Checking the target type at symlink creation time is not a good reason to violate the symlink() API specification. In 'nativestrict' mode, always create native symlinks. Choose the symlink type according to the target if it exists. Otherwise check the target path for a trailing '/' as hint to create a directory symlink. This allows callers to explicitly specify the expected target type, e.g.: $ ln -s test/ link-to-test $ mkdir test Signed-off-by: Karsten Blees <[email protected]>
1 parent 051bf0c commit 83c2abb

File tree

1 file changed

+32
-9
lines changed

1 file changed

+32
-9
lines changed

winsup/cygwin/path.cc

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,6 +1716,7 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
17161716
path_conv win32_oldpath;
17171717
PUNICODE_STRING final_oldpath, final_newpath;
17181718
UNICODE_STRING final_oldpath_buf;
1719+
bool isdir;
17191720

17201721
if (isabspath (oldpath))
17211722
{
@@ -1776,14 +1777,37 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
17761777
wcpcpy (e_old, c_old);
17771778
}
17781779
}
1779-
/* If the symlink target doesn't exist, don't create native symlink.
1780-
Otherwise the directory flag in the symlink is potentially wrong
1781-
when the target comes into existence, and native tools will fail.
1782-
This is so screwball. This is no problem on AFS, fortunately. */
1783-
if (!win32_oldpath.exists () && !win32_oldpath.fs_is_afs ())
1780+
1781+
/* The directory flag in the symlink must match the target type,
1782+
otherwise native tools will fail (fortunately this is no problem
1783+
on AFS). Do our best to guess the symlink type correctly. */
1784+
if (win32_oldpath.exists () || win32_oldpath.fs_is_afs ())
17841785
{
1785-
SetLastError (ERROR_FILE_NOT_FOUND);
1786-
return -1;
1786+
/* If the target exists (or on AFS), check the target type. Note
1787+
that this may still be wrong if the target is changed after
1788+
creating the symlink (e.g. in bulk operations such as rsync,
1789+
unpacking archives or VCS checkouts). */
1790+
isdir = win32_oldpath.isdir ();
1791+
}
1792+
else
1793+
{
1794+
if (allow_winsymlinks == WSYM_nativestrict)
1795+
{
1796+
/* In nativestrict mode, if the target does not exist, use
1797+
trailing '/' in the target path as hint to create a
1798+
directory symlink. */
1799+
ssize_t len = strlen(oldpath);
1800+
isdir = len && isdirsep(oldpath[len - 1]);
1801+
}
1802+
else
1803+
{
1804+
/* In native mode, if the target does not exist, fall back
1805+
to creating a Cygwin symlink file (or in case of MSys:
1806+
try to copy the (non-existing) target, which will of
1807+
course fail). */
1808+
SetLastError (ERROR_FILE_NOT_FOUND);
1809+
return -1;
1810+
}
17871811
}
17881812
/* Don't allow native symlinks to Cygwin special files. However, the
17891813
caller shoud know because this case shouldn't be covered by the
@@ -1813,8 +1837,7 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
18131837
}
18141838
/* Try to create native symlink. */
18151839
if (!CreateSymbolicLinkW (final_newpath->Buffer, final_oldpath->Buffer,
1816-
win32_oldpath.isdir ()
1817-
? SYMBOLIC_LINK_FLAG_DIRECTORY : 0))
1840+
isdir ? SYMBOLIC_LINK_FLAG_DIRECTORY : 0))
18181841
{
18191842
/* Repair native newpath, we still need it. */
18201843
final_newpath->Buffer[1] = L'?';

0 commit comments

Comments
 (0)