Commit a58854a0311316a66fda363e83665ab942d81ec6
2015-07-13T17:11:19
submodule, path: extract slash conversion Extract the backslash-to-slash conversion into a helper function.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/src/path.c b/src/path.c
index 2558058..16283ca 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1671,3 +1671,19 @@ bool git_path_isvalid(
return verify_component(repo, start, (c - start), flags);
}
+
+int git_path_normalize_slashes(git_buf *out, const char *path)
+{
+ int error;
+ char *p;
+
+ if ((error = git_buf_puts(out, path)) < 0)
+ return error;
+
+ for (p = out->ptr; *p; p++) {
+ if (*p == '\\')
+ *p = '/';
+ }
+
+ return 0;
+}
diff --git a/src/path.h b/src/path.h
index 5927a53..adb7686 100644
--- a/src/path.h
+++ b/src/path.h
@@ -591,4 +591,9 @@ extern bool git_path_isvalid(
const char *path,
unsigned int flags);
+/**
+ * Convert any backslashes into slashes
+ */
+int git_path_normalize_slashes(git_buf *out, const char *path);
+
#endif
diff --git a/src/submodule.c b/src/submodule.c
index e4469ef..f16d3c5 100644
--- a/src/submodule.c
+++ b/src/submodule.c
@@ -787,19 +787,15 @@ int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *ur
git_buf_sanitize(out);
+ /* We do this in all platforms in case someone on Windows created the .gitmodules */
if (strchr(url, '\\')) {
- char *p;
- if ((error = git_buf_puts(&normalized, url)) < 0)
+ if ((error = git_path_normalize_slashes(&normalized, url)) < 0)
return error;
- for (p = normalized.ptr; *p; p++) {
- if (*p == '\\')
- *p = '/';
- }
-
url = normalized.ptr;
}
+
if (git_path_is_relative(url)) {
if (!(error = get_url_base(out, repo)))
error = git_path_apply_relative(out, url);