Commit 7d55bee6 by Patrick Steinhardt

win32: fix relative symlinks pointing into dirs

On Windows platforms, we need some logic to emulate symlink(3P) defined
by POSIX. As unprivileged symlinks on Windows are a rather new feature,
our current implementation is comparatively new and still has some
rough edges in special cases.

One such case is relative symlinks. While relative symlinks to files in
the same directory work as expected, libgit2 currently fails to create
reltaive symlinks pointing into other directories. This is due to the
fact that we forgot to translate the Unix-style target path to
Windows-style. Most importantly, we are currently not converting
directory separators from "/" to "\".

Fix the issue by calling `git_win32_path_canonicalize` on the target.
Add a test that verifies our ability to create such relative links
across directories.
parent 9181e4b5
...@@ -439,8 +439,16 @@ int p_symlink(const char *target, const char *path) ...@@ -439,8 +439,16 @@ int p_symlink(const char *target, const char *path)
git_win32_path target_w, path_w; git_win32_path target_w, path_w;
DWORD dwFlags; DWORD dwFlags;
/*
* Convert both target and path to Windows-style paths. Note that we do
* not want to use `git_win32_path_from_utf8` for converting the target,
* as that function will automatically pre-pend the current working
* directory in case the path is not absolute. As Git will instead use
* relative symlinks, this is not someting we want.
*/
if (git_win32_path_from_utf8(path_w, path) < 0 || if (git_win32_path_from_utf8(path_w, path) < 0 ||
git__utf8_to_16(target_w, MAX_PATH, target) < 0) git__utf8_to_16(target_w, MAX_PATH, target) < 0 ||
git_win32_path_canonicalize(target_w) < 0)
return -1; return -1;
dwFlags = SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE; dwFlags = SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
......
...@@ -189,3 +189,30 @@ void test_core_posix__symlink_resolves_to_correct_type(void) ...@@ -189,3 +189,30 @@ void test_core_posix__symlink_resolves_to_correct_type(void)
git_buf_dispose(&contents); git_buf_dispose(&contents);
} }
void test_core_posix__symlink_to_file_across_dirs(void)
{
git_buf contents = GIT_BUF_INIT;
if (!git_path_supports_symlinks(clar_sandbox_path()))
clar__skip();
/*
* Create a relative symlink that points into another
* directory. This used to not work on Win32, where we
* forgot to convert directory separators to
* Windows-style ones.
*/
cl_must_pass(git_futils_mkdir("dir", 0777, 0));
cl_git_mkfile("dir/target", "symlink target");
cl_git_pass(p_symlink("dir/target", "link"));
cl_git_pass(git_futils_readbuffer(&contents, "dir/target"));
cl_assert_equal_s(contents.ptr, "symlink target");
cl_must_pass(p_unlink("dir/target"));
cl_must_pass(p_unlink("link"));
cl_must_pass(p_rmdir("dir"));
git_buf_dispose(&contents);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment