proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-07 05:43:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

win32 dirload: don't heap allocate DIR structure

Browse Source
This commit is contained in:
Edward Thomson 2015-04-27 18:02:06 -04:00
parent f3c444b879
commit e05531ddbd
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/win32/path_w32.c
View File

@ -321,7 +321,7 @@ int git_win32_path_dirload_with_stat(
int error = 0; int error = 0;
git_path_with_stat *ps; git_path_with_stat *ps;
git_win32_path pathw; git_win32_path pathw;
DIR *dir; DIR dir = {0};
int(*strncomp)(const char *a, const char *b, size_t sz); int(*strncomp)(const char *a, const char *b, size_t sz);
size_t cmp_len; size_t cmp_len;
size_t start_len = start_stat ? strlen(start_stat) : 0; size_t start_len = start_stat ? strlen(start_stat) : 0;
@ -333,22 +333,21 @@ int git_win32_path_dirload_with_stat(
size_t path_len; size_t path_len;
if (!git_win32__findfirstfile_filter(pathw, path)) { if (!git_win32__findfirstfile_filter(pathw, path)) {
error = -1;
giterr_set(GITERR_OS, "Could not parse the path '%s'", path); giterr_set(GITERR_OS, "Could not parse the path '%s'", path);
goto clean_up_and_exit; return -1;
} }
strncomp = (flags & GIT_PATH_DIR_IGNORE_CASE) != 0 strncomp = (flags & GIT_PATH_DIR_IGNORE_CASE) != 0 ?
? git__strncasecmp git__strncasecmp : git__strncmp;
: git__strncmp;
/* use of FIND_FIRST_EX_LARGE_FETCH flag in the FindFirstFileExW call could benefit perormance /* use of FIND_FIRST_EX_LARGE_FETCH flag in the FindFirstFileExW call could benefit perormance
* here when querying large repositories on Windows 7 (0x0600) or newer versions of Windows. * here when querying large repositories on Windows 7 (0x0600) or newer versions of Windows.
* doing so could introduce compatibility issues on older versions of Windows. */ * doing so could introduce compatibility issues on older versions of Windows. */
dir = git__calloc(1, sizeof(DIR)); dir.h = FindFirstFileExW(pathw, FindExInfoBasic, &dir.f, FindExSearchNameMatch, NULL, 0);
dir->h = FindFirstFileExW(pathw, FindExInfoBasic, &dir->f, FindExSearchNameMatch, NULL, 0); dir.first = 1;
dir->first = 1;
if (dir->h == INVALID_HANDLE_VALUE) { if (dir.h == INVALID_HANDLE_VALUE) {
error = -1; error = -1;
giterr_set(GITERR_OS, "Could not open directory '%s'", path); giterr_set(GITERR_OS, "Could not open directory '%s'", path);
goto clean_up_and_exit; goto clean_up_and_exit;
@ -362,9 +361,9 @@ int git_win32_path_dirload_with_stat(
memcpy(work_path, repo_path, repo_path_len); memcpy(work_path, repo_path, repo_path_len);
while (dir) { while (1) {
if (!git_path_is_dot_or_dotdotW(dir->f.cFileName)) { if (!git_path_is_dot_or_dotdotW(dir.f.cFileName)) {
path_len = git__utf16_to_8(work_path + repo_path_len, ARRAYSIZE(work_path) - repo_path_len, dir->f.cFileName); path_len = git__utf16_to_8(work_path + repo_path_len, ARRAYSIZE(work_path) - repo_path_len, dir.f.cFileName);
work_path[path_len + repo_path_len] = '\0'; work_path[path_len + repo_path_len] = '\0';
path_len = path_len + repo_path_len; path_len = path_len + repo_path_len;
@ -377,7 +376,7 @@ int git_win32_path_dirload_with_stat(
ps = git__calloc(1, sizeof(git_path_with_stat) + path_len + 2); ps = git__calloc(1, sizeof(git_path_with_stat) + path_len + 2);
if ((error = git_win32__file_attribute_to_stat(&ps->st, if ((error = git_win32__file_attribute_to_stat(&ps->st,
(WIN32_FILE_ATTRIBUTE_DATA *)&dir->f, (WIN32_FILE_ATTRIBUTE_DATA *)&dir.f,
NULL)) < 0) { NULL)) < 0) {
git__free(ps); git__free(ps);
goto clean_up_and_exit; goto clean_up_and_exit;
@ -400,10 +399,10 @@ int git_win32_path_dirload_with_stat(
} }
} }
memset(&dir->f, 0, sizeof(git_path_with_stat)); memset(&dir.f, 0, sizeof(git_path_with_stat));
dir->first = 0; dir.first = 0;
if (!FindNextFileW(dir->h, &dir->f)) { if (!FindNextFileW(dir.h, &dir.f)) {
if (GetLastError() == ERROR_NO_MORE_FILES) if (GetLastError() == ERROR_NO_MORE_FILES)
break; break;
else { else {
@ -418,11 +417,8 @@ int git_win32_path_dirload_with_stat(
git_vector_sort(contents); git_vector_sort(contents);
clean_up_and_exit: clean_up_and_exit:
if (dir.h != INVALID_HANDLE_VALUE)
if (dir) { FindClose(dir.h);
FindClose(dir->h);
free(dir);
}
return error; return error;
} }