Skip to content
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

1. fix /. to root 2. remove the leader chars from path "//", "/./" #692

Closed
wants to merge 3 commits into from
Closed

1. fix /. to root 2. remove the leader chars from path "//", "/./" #692

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d073a15
1. fix /. to root 2. remove the leader chars from path "//", "/./"
tick-guo Sep 23, 2023
80ae785
Merge branch 'PowerShell:latestw_all' into latestw_all
tick-guo Nov 5, 2023
ba83b49
Merge branch 'PowerShell:latestw_all' into latestw_all
tick-guo Jan 9, 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
45 changes: 45 additions & 0 deletions contrib/win32/win32compat/misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,41 @@ convertToForwardslash(char *str)
}
}

// cut the leader char
static void pre_cut_path(char* inputpath) {
if (!inputpath) {
return;
}
size_t path_len_org = 0, path_len = 0;
path_len_org = strlen(inputpath);
path_len = path_len_org;
/* fix /./ to / */
if (path_len >= 3 && inputpath[0] == '/' && inputpath[1] == '.' && inputpath[2] == '/') {
int offset = 0;
while (offset <= (path_len - 2)) {
inputpath[offset] = inputpath[offset + 2];
offset++;
}
}
path_len = strlen(inputpath);
/* fix // to / */
if (path_len >= 2 && inputpath[0] == '/' && inputpath[1] == '/') {
int offset = 0;
while (offset <= (path_len - 1)) {
inputpath[offset] = inputpath[offset + 1];
offset++;
}
}

if (strlen(inputpath) == path_len_org) {
return;
}
else {
//repeat until no leader char
pre_cut_path(inputpath);
}
}

/*
* This method will resolves references to /./, /../ and extra '/' characters in the null-terminated string named by
* path to produce a canonicalized absolute pathname.
Expand Down Expand Up @@ -987,13 +1022,23 @@ realpath(const char *inputpath, char * resolved)
return NULL;
}

pre_cut_path(path);
path_len = strlen(path);

/* resolve root directory to the same */
if (path_len == 1 && (path[0] == '/' || path[0] == '\\')) {
resolved[0] = '/';
resolved[1] = '\0';
ret = resolved;
goto done;
}
/* fix /. to root */
if (strcmp(path, "/.") == 0) {
resolved[0] = '/';
resolved[1] = '\0';
ret = resolved;
goto done;
}

/* resolve this common case scenario to root */
/* "cd .." from within a drive root */
Expand Down