mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-07 23:19:28 +00:00
submodule: normalize slashes in resolve_url
Our path functions expect to work with slashes, so convert a path with backslashes into one with slashes at the top of the function.
This commit is contained in:
parent
aa51fa1e03
commit
f00f005bad
@ -781,11 +781,25 @@ const char *git_submodule_url(git_submodule *submodule)
|
|||||||
int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *url)
|
int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *url)
|
||||||
{
|
{
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
git_buf normalized = GIT_BUF_INIT;
|
||||||
|
|
||||||
assert(out && repo && url);
|
assert(out && repo && url);
|
||||||
|
|
||||||
git_buf_sanitize(out);
|
git_buf_sanitize(out);
|
||||||
|
|
||||||
|
if (strchr(url, '\\')) {
|
||||||
|
char *p;
|
||||||
|
if ((error = git_buf_puts(&normalized, url)) < 0)
|
||||||
|
return error;
|
||||||
|
|
||||||
|
for (p = normalized.ptr; *p; p++) {
|
||||||
|
if (*p == '\\')
|
||||||
|
*p = '/';
|
||||||
|
}
|
||||||
|
|
||||||
|
url = normalized.ptr;
|
||||||
|
}
|
||||||
|
|
||||||
if (git_path_is_relative(url)) {
|
if (git_path_is_relative(url)) {
|
||||||
if (!(error = get_url_base(out, repo)))
|
if (!(error = get_url_base(out, repo)))
|
||||||
error = git_path_apply_relative(out, url);
|
error = git_path_apply_relative(out, url);
|
||||||
@ -796,6 +810,7 @@ int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *ur
|
|||||||
error = -1;
|
error = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
git_buf_free(&normalized);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user