Skip to content

fix: skip MSYS2 path conversion for rsync-over-SSH remote paths #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vicjayjay wants to merge 1 commit into
base: msys2-3.6.7
Choose a base branch
from
+19 −0
Open

fix: skip MSYS2 path conversion for rsync-over-SSH remote paths #331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions winsup/cygwin/msys2_path_conv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,12 @@ path_type find_path_start_and_type(const char** src, int recurse, const char* en
if (*it == ':')
goto skip_p2w;

// Track '@' position for SCP/rsync remote path detection.
// Only set when the prefix looks like a valid username
// (alphanumeric, dots, dashes).
#define ALNUMDD ".-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
const char *at = NULL;

while (it != end && *it) {
switch (*it) {
case '`':
Expand All @@ -389,11 +395,24 @@ path_type find_path_start_and_type(const char** src, int recurse, const char* en
if (it + 3 < end && it[2] == '.' && it[3] == '/')
goto skip_p2w;
}

// Skip SCP/rsync remote paths: user@host:/path
// Verify: at was set, hostname between at+1 and colon
// is all valid hostname chars, and colon is followed
// by / then an alphanumeric character.
if (at && strspn(at + 1, ALNUMDD) == (size_t)(it - at - 1)
&& it + 2 < end && it[1] == '/' && isalnum(it[2]))
goto skip_p2w;
break;
case '@':
// Paths do not contain '@@'
if (it + 1 < end && it[1] == '@')
goto skip_p2w;

// Record '@' only if the prefix is a valid username
if (!at && strspn(*src, ALNUMDD) == (size_t)(it - *src))
at = it;
break;
}
++it;
}
Expand Down
Loading