Skip to content

Fix pathconv issues related to relative paths in path lists #213

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

Closed
ReinhardBiegelIntech wants to merge 3 commits into from
Closed

Fix pathconv issues related to relative paths in path lists #213

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ef78d5
fixup! Add functionality for converting UNIX paths in arguments and e…
dscho Apr 17, 2024
222fa6e
pathconv: Also skip git/scp path list conversion for environment vari…
ReinhardBiegelIntech Apr 29, 2024
a907109
pathconv: Check for end of input when determining potential path list
ReinhardBiegelIntech Jul 2, 2024
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
39 changes: 36 additions & 3 deletions winsup/cygwin/msys2_path_conv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void find_end_of_rooted_path(const char** from, const char** to, int* in_string)
void sub_convert(const char** from, const char** to, char** dst, const char* dstend, int* in_string) {
const char* copy_from = *from;
path_type type = find_path_start_and_type(from, false, *to);
debug_printf("found type %d for path %s", type, copy_from);
debug_printf("found type %d for path %s\n", type, copy_from);

if (type == POSIX_PATH_LIST) {
find_end_of_posix_list(to, in_string);
Expand Down Expand Up @@ -358,6 +358,40 @@ path_type find_path_start_and_type(const char** src, int recurse, const char* en
return NONE;
}

/*
* Discern between Git's `<rev>:<path>`, SCP's `<host>:<path>` pattern
* (which is not a path list but may naively look like one) on the one
* hand, and path lists starting with `/<path>`, `./<path>` or `../<path>`
* on the other hand.
*/
bool potential_path_list = *it == '/' ||
(*it == '.' &&
(it + 1 == end || it[1] == '\0' || it[1] == ':' || it[1] == '/' ||
(it[1] == '.' &&
(it + 2 == end || it[2] == '\0' || it[2] == ':' || it[2] == '/'))));

/*
* Determine if assignment to an environment variable takes place (and
* skip Git/SCP handling if so)
*/
bool potential_command_scope_env = false;
if (isalpha(*it) || *it == '_' || *it == '-') {
++it;

if (it != end) {
if (*it == '-')
++it;

while (it != end && *it && (isalnum(*it) || *it == '_')) {
++it;
}

if (*it == '=')
potential_command_scope_env = true;
}
it = *src;
}

/*
* Prevent Git's :file.txt and :/message syntax from beeing modified.
*/
Expand All @@ -383,7 +417,7 @@ path_type find_path_start_and_type(const char** src, int recurse, const char* en
goto skip_p2w;

// Leave Git's <rev>:./name syntax alone
if (it + 1 < end && it[1] == '.') {
if (!potential_path_list && !potential_command_scope_env && it + 1 < end && it[1] == '.') {
if (it + 2 < end && it[2] == '/')
goto skip_p2w;
if (it + 3 < end && it[2] == '.' && it[3] == '/')
Expand Down Expand Up @@ -706,4 +740,3 @@ void posix_to_win32_path(const char* from, const char* to, char** dst, const cha
}
}
}