proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 13:12:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make it compile with MinGW on Windows

Browse Source 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
This commit is contained in:
Sven Strickroth 2012-09-29 21:24:07 +02:00
parent 32a4e3b712
commit 77ddd4ccc3
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/fileops.c
View File

@ -471,21 +471,13 @@ nullterm:
int find_system_file_using_path(git_buf *path, const char *filename) int find_system_file_using_path(git_buf *path, const char *filename)
{ {
size_t size = 0; wchar_t * env = NULL;
wchar_t * env = NULL, * envOrig = NULL;
struct win32_path root; struct win32_path root;
_wgetenv_s(&size, NULL, 0, L"PATH"); env = _wgetenv(L"PATH");
if (!env)
if (!size)
return -1; return -1;
// make a copy of the content of the environment variable so that we can modify it
envOrig = git__calloc(size, sizeof(wchar_t));
GITERR_CHECK_ALLOC(envOrig);
_wgetenv_s(&size, envOrig, size, L"PATH");
env = envOrig;
// search in all paths defined in PATH // search in all paths defined in PATH
while ((env = nextpath(env, root.path, MAX_PATH - 1)) != NULL && *root.path) while ((env = nextpath(env, root.path, MAX_PATH - 1)) != NULL && *root.path)
{ {
@ -493,25 +485,20 @@ int find_system_file_using_path(git_buf *path, const char *filename)
// ensure trailing slash // ensure trailing slash
if (*pfin != L'/' && *pfin != L'\\') if (*pfin != L'/' && *pfin != L'\\')
wcscpy_s(++pfin, 2, L"\\"); // we have enough space left, MAX_PATH - 1 is used in nextpath above wcscpy(++pfin, L"\\"); // we have enough space left, MAX_PATH - 1 is used in nextpath above
root.len = (DWORD)wcslen(root.path) + 1; root.len = (DWORD)wcslen(root.path) + 1;
if (win32_find_file(path, &root, "git.cmd") == 0 || win32_find_file(path, &root, "git.exe") == 0) { if (win32_find_file(path, &root, "git.cmd") == 0 || win32_find_file(path, &root, "git.exe") == 0) {
// we found the cmd or bin directory of a git installaton // we found the cmd or bin directory of a git installaton
if (root.len > 5) { if (root.len > 5) {
wcscpy_s(root.path + wcslen(root.path) - 4, 5, L"etc\\"); wcscpy(root.path + wcslen(root.path) - 4, L"etc\\");
if (win32_find_file(path, &root, filename) == 0) if (win32_find_file(path, &root, filename) == 0)
{
git__free(envOrig);
return 0; return 0;
}
} }
} }
} }
git__free(envOrig);
return GIT_ENOTFOUND; return GIT_ENOTFOUND;
} }
@ -535,11 +522,12 @@ int find_system_file_using_registry(git_buf *path, const char *filename)
if (RegQueryValueExW(hKey, L"InstallLocation", NULL, &dwType,(LPBYTE)&root.path, &dwSize) == ERROR_SUCCESS) if (RegQueryValueExW(hKey, L"InstallLocation", NULL, &dwType,(LPBYTE)&root.path, &dwSize) == ERROR_SUCCESS)
{ {
// InstallLocation points to the root of the msysgit directory // InstallLocation points to the root of the msysgit directory
if (wcscat_s(root.path, MAX_PATH, L"etc\\")) if (dwSize + 4 > MAX_PATH) // 4 = wcslen(L"etc\\")
{ {
giterr_set(GITERR_OS, "Cannot locate the system's msysgit directory - path too long"); giterr_set(GITERR_OS, "Cannot locate the system's msysgit directory - path too long");
return -1; return -1;
} }
wcscat(root.path, L"etc\\");
root.len = (DWORD)wcslen(root.path) + 1; root.len = (DWORD)wcslen(root.path) + 1;
} }
} }