Commit 7fd5dfa0fe22f4a91ce5f65c3fe643fbad37bdfd
2021-12-25T15:25:15
Correctly detect the share/template folder With Git for Windows >= 2 the share folder is in an architecture specific subfolder. This also add support for Git for Windows versions between 2 and 2.24 where also the etc folder is in an architecture specific subfolder. Signed-off-by: Sven Strickroth <email@cs-ware.de>
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 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
diff --git a/src/win32/findfile.c b/src/win32/findfile.c
index 0dcce14..8975894 100644
--- a/src/win32/findfile.c
+++ b/src/win32/findfile.c
@@ -70,6 +70,46 @@ static wchar_t *win32_walkpath(wchar_t *path, wchar_t *buf, size_t buflen)
return (path != base) ? path : NULL;
}
+static int win32_find_git_for_windows_architecture_root(_findfile_path *root_path, const wchar_t *subdir)
+{
+ /* Git for Windows >= 2 comes with a special architecture root (mingw64 and mingw32)
+ * under which the "share" folder is located, check which we need (none is also ok) */
+
+ static const wchar_t *architecture_roots[4] = {
+ L"", // starting with Git 2.24 the etc folder is directly in the root folder
+ L"mingw64\\",
+ L"mingw32\\",
+ NULL,
+ };
+
+ const wchar_t **roots = architecture_roots;
+ for (; *roots != NULL; ++roots) {
+ git_win32_path tmp_root;
+ DWORD subdir_len;
+ if (wcscpy(tmp_root, root_path->path) &&
+ root_path->len + wcslen(*roots) <= MAX_PATH &&
+ wcscat(tmp_root, *roots) &&
+ !_waccess(tmp_root, F_OK)) {
+ wcscpy(root_path->path, tmp_root);
+ root_path->len += (DWORD)wcslen(*roots);
+
+ subdir_len = (DWORD)wcslen(subdir);
+ if (root_path->len + subdir_len >= MAX_PATH)
+ break;
+
+ // append subdir and check whether it exists for the Git installation
+ wcscat(tmp_root, subdir);
+ if (!_waccess(tmp_root, F_OK)) {
+ wcscpy(root_path->path, tmp_root);
+ root_path->len += subdir_len;
+ break;
+ }
+ }
+ }
+
+ return 0;
+}
+
static int win32_find_git_in_path(git_str *buf, const wchar_t *gitexe, const wchar_t *subdir)
{
wchar_t *env = _wgetenv(L"PATH"), lastch;
@@ -94,11 +134,13 @@ static int win32_find_git_in_path(git_str *buf, const wchar_t *gitexe, const wch
wcscpy(&root.path[root.len], gitexe);
if (!_waccess(root.path, F_OK)) {
- /* replace "bin\\" or "cmd\\" of a Git for Windows installation with subdir OR append path */
+ /* check whether we found a Git for Windows installation and do some path adjustments OR just append subdir */
if ((root.len > 5 && wcscmp(root.path - 4, L"cmd\\")) || wcscmp(root.path - 4, L"bin\\")) {
- if (root.len - 4 + wcslen(subdir) >= MAX_PATH)
+ /* strip "bin" or "cmd" and try to find architecture root for appending subdir */
+ root.len -= 4;
+ root.path[root.len] = L'\0';
+ if (win32_find_git_for_windows_architecture_root(&root, subdir))
continue;
- wcscpy(&root.path[root.len - 4], subdir);
} else {
if (root.len + wcslen(subdir) >= MAX_PATH)
continue;
@@ -123,22 +165,21 @@ static int win32_find_git_in_registry(
if (!RegOpenKeyExW(hive, key, 0, KEY_READ, &hKey)) {
DWORD dwType, cbData;
- git_win32_path path;
+ _findfile_path path;
/* Ensure that the buffer is big enough to have the suffix attached
* after we receive the result. */
cbData = (DWORD)(sizeof(path) - wcslen(subdir) * sizeof(wchar_t));
/* InstallLocation points to the root of the git directory */
- if (!RegQueryValueExW(hKey, L"InstallLocation", NULL, &dwType, (LPBYTE)path, &cbData) &&
+ if (!RegQueryValueExW(hKey, L"InstallLocation", NULL, &dwType, (LPBYTE)path.path, &cbData) &&
dwType == REG_SZ) {
-
- /* Append the suffix */
- wcscat(path, subdir);
+ path.len = cbData;
/* Convert to UTF-8, with forward slashes, and output the path
* to the provided buffer */
- if (!win32_path_to_8(buf, path))
+ if (!win32_find_git_for_windows_architecture_root(&path, subdir) &&
+ !win32_path_to_8(buf, path.path))
error = 0;
}