This code was duplicated between the lnk symlink type and the native
symlink type.
Signed-off-by: Jeremy Drake <cyg...@jdrake.com>
---
I have been working on cleaning up msys2's "deepcopy" symlink mode code
and noticed it was doing the same thing in a different way. I copy-pasted
the code from the lnk path, then factored it out into a function when I
noticed the native path doing the same thing. Then I realized, "that's
stupid, I'm creating a bigger diff from upstream for a code cleanup".
So I reverted it there and figured I'd send it here first, and adopt
using it in the deepcopy code if/when it's applied here and in a released
version.
winsup/cygwin/path.cc | 52 ++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 28 deletions(-)
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 658f3f9cf7..69675b2e23 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -1756,6 +1756,28 @@ symlink (const char *oldpath, const char *newpath)
return -1;
}
+static bool
+resolve_symlink_target (const char *oldpath, const path_conv &win32_newpath,
+ path_conv &win32_oldpath)
+{
+ if (isabspath (oldpath))
+ {
+ win32_oldpath.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes);
+ return true;
+ }
+ else
+ {
+ tmp_pathbuf tp;
+ size_t len = strrchr (win32_newpath.get_posix (), '/')
+ - win32_newpath.get_posix () + 1;
+ char *absoldpath = tp.t_get ();
+ stpcpy (stpncpy (absoldpath, win32_newpath.get_posix (), len),
+ oldpath);
+ win32_oldpath.check (absoldpath, PC_SYM_NOFOLLOW, stat_suffixes);
+ return false;
+ }
+}
+
static int
symlink_nfs (const char *oldpath, path_conv &win32_newpath)
{
@@ -1816,23 +1838,12 @@ symlink_native (const char *oldpath, path_conv
&win32_newpath)
UNICODE_STRING final_oldpath_buf;
DWORD flags;
- if (isabspath (oldpath))
+ if (resolve_symlink_target (oldpath, win32_newpath, win32_oldpath))
{
- win32_oldpath.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes);
final_oldpath = win32_oldpath.get_nt_native_path ();
}
else
{
- /* The symlink target is relative to the directory in which
- the symlink gets created, not relative to the cwd. Therefore
- we have to mangle the path quite a bit before calling path_conv. */
- ssize_t len = strrchr (win32_newpath.get_posix (), '/')
- - win32_newpath.get_posix () + 1;
- char *absoldpath = tp.t_get ();
- stpcpy (stpncpy (absoldpath, win32_newpath.get_posix (), len),
- oldpath);
- win32_oldpath.check (absoldpath, PC_SYM_NOFOLLOW, stat_suffixes);
-
/* Try hard to keep Windows symlink path relative. */
/* 1. Find common path prefix. Skip leading \\?\, but take pre-increment
@@ -2025,7 +2036,6 @@ int
symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
{
int res = -1;
- size_t len;
char *buf, *cp;
tmp_pathbuf tp;
winsym_t wsym_type;
@@ -2137,21 +2147,7 @@ symlink_worker (const char *oldpath, path_conv
&win32_newpath, bool isdevice)
/* The symlink target is relative to the directory in which the
symlink gets created, not relative to the cwd. Therefore we
have to mangle the path quite a bit before calling path_conv.*/
- if (isabspath (oldpath))
- win32_oldpath.check (oldpath,
- PC_SYM_NOFOLLOW,
- stat_suffixes);
- else
- {
- len = strrchr (win32_newpath.get_posix (), '/')
- - win32_newpath.get_posix () + 1;
- char *absoldpath = tp.t_get ();
- stpcpy (stpncpy (absoldpath, win32_newpath.get_posix (),
- len),
- oldpath);
- win32_oldpath.check (absoldpath, PC_SYM_NOFOLLOW,
- stat_suffixes);
- }
+ resolve_symlink_target (oldpath, win32_newpath, win32_oldpath);
if (SUCCEEDED (SHGetDesktopFolder (&psl)))
{
WCHAR wc_path[win32_oldpath.get_wide_win32_path_len () + 1];
--
2.47.1.windows.2
