summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2014-10-14 16:31:55 -0400
committerEdward Thomson <ethomson@microsoft.com>2014-10-22 17:49:53 -0400
commit12f32d919390f47124bed41d6c54d75b666e1e5e (patch)
tree117f850eca530b39e8eecd3171a9ea4e0f827679 /src
parent89244e7ff9755657b96d733b6936cecbd4e2ef0c (diff)
downloadlibgit2-12f32d919390f47124bed41d6c54d75b666e1e5e.tar.gz
Remote paths: canonicalize UNC paths on Win32
Git for Windows will handle UNC paths only when in forward-slash format, eg "//server/path". When given a UNC path as a remote, rewrite standard format ("\\server\path") into this ridiculous format.
Diffstat (limited to 'src')
-rw-r--r--src/remote.c30
1 files changed, 26 insertions, 4 deletions
diff --git a/src/remote.c b/src/remote.c
index 8d928a5b8..ea510c7d4 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -114,10 +114,30 @@ static int get_check_cert(int *out, git_repository *repo)
}
#endif
+static int canonicalize_url(git_buf *out, const char *in)
+{
+ const char *c;
+
+#ifdef GIT_WIN32
+ /* Given a UNC path like \\server\path, we need to convert this
+ * to //server/path for compatibility with core git.
+ */
+ if (in[0] == '\\' && in[1] == '\\' &&
+ (git__isalpha(in[2]) || git__isdigit(in[2]))) {
+ for (c = in; *c; c++)
+ git_buf_putc(out, *c == '\\' ? '/' : *c);
+
+ return git_buf_oom(out) ? -1 : 0;
+ }
+#endif
+
+ return git_buf_puts(out, in);
+}
+
static int create_internal(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch)
{
git_remote *remote;
- git_buf fetchbuf = GIT_BUF_INIT;
+ git_buf canonical_url = GIT_BUF_INIT, fetchbuf = GIT_BUF_INIT;
int error = -1;
/* name is optional */
@@ -129,11 +149,11 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n
remote->repo = repo;
remote->update_fetchhead = 1;
- if (git_vector_init(&remote->refs, 32, NULL) < 0)
+ if (git_vector_init(&remote->refs, 32, NULL) < 0 ||
+ canonicalize_url(&canonical_url, url) < 0)
goto on_error;
- remote->url = git__strdup(url);
- GITERR_CHECK_ALLOC(remote->url);
+ remote->url = git_buf_detach(&canonical_url);
if (name != NULL) {
remote->name = git__strdup(name);
@@ -151,11 +171,13 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n
*out = remote;
git_buf_free(&fetchbuf);
+ git_buf_free(&canonical_url);
return 0;
on_error:
git_remote_free(remote);
git_buf_free(&fetchbuf);
+ git_buf_free(&canonical_url);
return error;
}