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

compat: make p_realpath Windows implementation be a bit more POSIX compliant and fail if the provided path does not lead to an existing entry

Browse Source
This commit is contained in:
nulltoken 2012-05-07 13:58:01 +02:00
parent 46811561ae
commit 9abb5bca5d
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/path.c
View File

@ -205,9 +205,13 @@ int git_path_prettify(git_buf *path_out, const char *path, const char *base)
} }
if (p_realpath(path, buf) == NULL) { if (p_realpath(path, buf) == NULL) {
/* giterr_set resets the errno when dealing with a GITERR_OS kind of error */
int error = (errno == ENOENT || errno == ENOTDIR) ? GIT_ENOTFOUND : -1;
giterr_set(GITERR_OS, "Failed to resolve path '%s'", path); giterr_set(GITERR_OS, "Failed to resolve path '%s'", path);
git_buf_clear(path_out); git_buf_clear(path_out);
return (errno == ENOENT || errno == ENOTDIR) ? GIT_ENOTFOUND : -1;
return error;
} }
return git_buf_sets(path_out, buf); return git_buf_sets(path_out, buf);

21
src/win32/posix_w32.c
View File

@ -326,7 +326,7 @@ int p_hide_directory__w32(const char *path)
char *p_realpath(const char *orig_path, char *buffer) char *p_realpath(const char *orig_path, char *buffer)
{ {
int ret; int ret, buffer_sz = 0;
wchar_t* orig_path_w = gitwin_to_utf16(orig_path); wchar_t* orig_path_w = gitwin_to_utf16(orig_path);
wchar_t* buffer_w = (wchar_t*)git__malloc(GIT_PATH_MAX * sizeof(wchar_t)); wchar_t* buffer_w = (wchar_t*)git__malloc(GIT_PATH_MAX * sizeof(wchar_t));
@ -336,13 +336,14 @@ char *p_realpath(const char *orig_path, char *buffer)
ret = GetFullPathNameW(orig_path_w, GIT_PATH_MAX, buffer_w, NULL); ret = GetFullPathNameW(orig_path_w, GIT_PATH_MAX, buffer_w, NULL);
git__free(orig_path_w); git__free(orig_path_w);
if (!ret || ret > GIT_PATH_MAX) { /* According to MSDN, a return value equals to zero means a failure. */
if (ret == 0 || ret > GIT_PATH_MAX) {
buffer = NULL; buffer = NULL;
goto done; goto done;
} }
if (buffer == NULL) { if (buffer == NULL) {
int buffer_sz = WideCharToMultiByte(CP_UTF8, 0, buffer_w, -1, NULL, 0, NULL, NULL); buffer_sz = WideCharToMultiByte(CP_UTF8, 0, buffer_w, -1, NULL, 0, NULL, NULL);
if (!buffer_sz || if (!buffer_sz ||
!(buffer = (char *)git__malloc(buffer_sz)) || !(buffer = (char *)git__malloc(buffer_sz)) ||
@ -350,10 +351,22 @@ char *p_realpath(const char *orig_path, char *buffer)
{ {
git__free(buffer); git__free(buffer);
buffer = NULL; buffer = NULL;
goto done;
} }
} else { } else {
if (!WideCharToMultiByte(CP_UTF8, 0, buffer_w, -1, buffer, GIT_PATH_MAX, NULL, NULL)) if (!WideCharToMultiByte(CP_UTF8, 0, buffer_w, -1, buffer, GIT_PATH_MAX, NULL, NULL)) {
buffer = NULL; buffer = NULL;
goto done;
}
}
if (!git_path_exists(buffer))
{
if (buffer_sz > 0)
git__free(buffer);
buffer = NULL;
errno = ENOENT;
} }
done: done:

13
tests-clar/core/path.c
View File

@ -405,3 +405,16 @@ void test_core_path__12_offset_to_path_root(void)
cl_assert(git_path_root("//computername") == -1); cl_assert(git_path_root("//computername") == -1);
#endif #endif
} }
#define NON_EXISTING_FILEPATH "i_hope_i_do_not_exist"
void test_core_path__13_cannot_prettify_a_non_existing_file(void)
{
git_buf p = GIT_BUF_INIT;
cl_must_pass(git_path_exists(NON_EXISTING_FILEPATH) == false);
cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH, NULL));
cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH "/so-do-i", NULL));
git_buf_free(&p);
}