mirror of
https://git.proxmox.com/git/libgit2
synced 2025-12-07 12:08:42 +00:00
Merge pull request #726 from arrbee/utf16-home-dir
Get user's home dir in UTF-16 clean manner
This commit is contained in:
Russell Belfer
commit
5f60fd0098
@ -353,13 +353,48 @@ int git_futils_rmdir_r(const char *path, git_directory_removal_type removal_type
|
||||
return error;
|
||||
}
|
||||
|
||||
#ifdef GIT_WIN32
|
||||
static char *win32_getenv(const wchar_t *name)
|
||||
{
|
||||
char *val_utf8;
|
||||
wchar_t *val_utf16;
|
||||
DWORD len = GetEnvironmentVariableW(name, NULL, 0);
|
||||
|
||||
if (len <= 0)
|
||||
return NULL;
|
||||
|
||||
val_utf16 = git__calloc(len, sizeof(wchar_t));
|
||||
if (!val_utf16)
|
||||
return NULL;
|
||||
|
||||
if (GetEnvironmentVariableW(name, val_utf16, len) != len - 1) {
|
||||
giterr_set(GITERR_OS, "Could not read environment variable");
|
||||
git__free(val_utf16);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
val_utf8 = gitwin_from_utf16(val_utf16);
|
||||
|
||||
git__free(val_utf16);
|
||||
|
||||
return val_utf8;
|
||||
}
|
||||
#endif
|
||||
|
||||
int git_futils_find_global_file(git_buf *path, const char *filename)
|
||||
{
|
||||
const char *home = getenv("HOME");
|
||||
char *home;
|
||||
|
||||
#ifdef GIT_WIN32
|
||||
if (home == NULL)
|
||||
home = getenv("USERPROFILE");
|
||||
home = win32_getenv(L"HOME");
|
||||
|
||||
if (!home)
|
||||
home = win32_getenv(L"USERPROFILE");
|
||||
|
||||
if (home)
|
||||
git_path_mkposix(home);
|
||||
#else
|
||||
home = getenv("HOME");
|
||||
#endif
|
||||
|
||||
if (home == NULL) {
|
||||
@ -371,6 +406,10 @@ int git_futils_find_global_file(git_buf *path, const char *filename)
|
||||
if (git_buf_joinpath(path, home, filename) < 0)
|
||||
return -1;
|
||||
|
||||
#ifdef GIT_WIN32
|
||||
git__free(home);
|
||||
#endif
|
||||
|
||||
if (git_path_exists(path->ptr) == false) {
|
||||
git_buf_clear(path);
|
||||
return GIT_ENOTFOUND;
|
||||
|
||||
@ -32,19 +32,16 @@ void gitwin_set_utf8(void)
|
||||
wchar_t* gitwin_to_utf16(const char* str)
|
||||
{
|
||||
wchar_t* ret;
|
||||
size_t cb;
|
||||
int cb;
|
||||
|
||||
if (!str)
|
||||
return NULL;
|
||||
|
||||
cb = strlen(str) * sizeof(wchar_t);
|
||||
cb = MultiByteToWideChar(_active_codepage, 0, str, -1, NULL, 0);
|
||||
if (cb == 0)
|
||||
return (wchar_t *)git__calloc(1, sizeof(wchar_t));
|
||||
|
||||
/* Add space for null terminator */
|
||||
cb += sizeof(wchar_t);
|
||||
|
||||
ret = (wchar_t *)git__malloc(cb);
|
||||
ret = (wchar_t *)git__malloc(cb * sizeof(wchar_t));
|
||||
if (!ret)
|
||||
return NULL;
|
||||
|
||||
@ -59,7 +56,8 @@ wchar_t* gitwin_to_utf16(const char* str)
|
||||
|
||||
int gitwin_append_utf16(wchar_t *buffer, const char *str, size_t len)
|
||||
{
|
||||
int result = MultiByteToWideChar(_active_codepage, 0, str, -1, buffer, (int)len);
|
||||
int result = MultiByteToWideChar(
|
||||
_active_codepage, 0, str, -1, buffer, (int)len);
|
||||
if (result == 0)
|
||||
giterr_set(GITERR_OS, "Could not convert string to UTF-16");
|
||||
return result;
|
||||
@ -68,23 +66,22 @@ int gitwin_append_utf16(wchar_t *buffer, const char *str, size_t len)
|
||||
char* gitwin_from_utf16(const wchar_t* str)
|
||||
{
|
||||
char* ret;
|
||||
size_t cb;
|
||||
int cb;
|
||||
|
||||
if (!str)
|
||||
return NULL;
|
||||
|
||||
cb = wcslen(str) * sizeof(char);
|
||||
cb = WideCharToMultiByte(_active_codepage, 0, str, -1, NULL, 0, NULL, NULL);
|
||||
if (cb == 0)
|
||||
return (char *)git__calloc(1, sizeof(char));
|
||||
|
||||
/* Add space for null terminator */
|
||||
cb += sizeof(char);
|
||||
|
||||
ret = (char*)git__malloc(cb);
|
||||
if (!ret)
|
||||
return NULL;
|
||||
|
||||
if (WideCharToMultiByte(_active_codepage, 0, str, -1, ret, (int)cb, NULL, NULL) == 0) {
|
||||
if (WideCharToMultiByte(
|
||||
_active_codepage, 0, str, -1, ret, (int)cb, NULL, NULL) == 0)
|
||||
{
|
||||
giterr_set(GITERR_OS, "Could not convert string to UTF-8");
|
||||
git__free(ret);
|
||||
ret = NULL;
|
||||
|
||||
136
tests-clar/core/env.c
Normal file
136
tests-clar/core/env.c
Normal file
@ -0,0 +1,136 @@
|
||||
#include "clar_libgit2.h"
|
||||
#include "fileops.h"
|
||||
#include "path.h"
|
||||
|
||||
#ifdef GIT_WIN32
|
||||
|
||||
#include "win32/utf-conv.h"
|
||||
|
||||
static char *cl_getenv(const char *name)
|
||||
{
|
||||
wchar_t *name_utf16 = gitwin_to_utf16(name);
|
||||
DWORD value_len, alloc_len;
|
||||
wchar_t *value_utf16;
|
||||
char *value_utf8;
|
||||
|
||||
cl_assert(name_utf16);
|
||||
alloc_len = GetEnvironmentVariableW(name_utf16, NULL, 0);
|
||||
if (alloc_len <= 0)
|
||||
return NULL;
|
||||
|
||||
cl_assert(value_utf16 = git__calloc(alloc_len, sizeof(wchar_t)));
|
||||
|
||||
value_len = GetEnvironmentVariableW(name_utf16, value_utf16, alloc_len);
|
||||
cl_assert_equal_i(value_len, alloc_len - 1);
|
||||
|
||||
cl_assert(value_utf8 = gitwin_from_utf16(value_utf16));
|
||||
|
||||
git__free(value_utf16);
|
||||
|
||||
return value_utf8;
|
||||
}
|
||||
|
||||
static int cl_setenv(const char *name, const char *value)
|
||||
{
|
||||
wchar_t *name_utf16 = gitwin_to_utf16(name);
|
||||
wchar_t *value_utf16 = value ? gitwin_to_utf16(value) : NULL;
|
||||
|
||||
cl_assert(name_utf16);
|
||||
cl_assert(SetEnvironmentVariableW(name_utf16, value_utf16));
|
||||
|
||||
git__free(name_utf16);
|
||||
git__free(value_utf16);
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
#else
|
||||
|
||||
#include <stdlib.h>
|
||||
#define cl_getenv(n) getenv(n)
|
||||
#define cl_setenv(n,v) (v) ? setenv((n),(v),1) : unsetenv(n)
|
||||
|
||||
#endif
|
||||
|
||||
static char *env_home = NULL;
|
||||
#ifdef GIT_WIN32
|
||||
static char *env_userprofile = NULL;
|
||||
#endif
|
||||
|
||||
void test_core_env__initialize(void)
|
||||
{
|
||||
env_home = cl_getenv("HOME");
|
||||
#ifdef GIT_WIN32
|
||||
env_userprofile = cl_getenv("USERPROFILE");
|
||||
#endif
|
||||
}
|
||||
|
||||
void test_core_env__cleanup(void)
|
||||
{
|
||||
cl_setenv("HOME", env_home);
|
||||
#ifdef GIT_WIN32
|
||||
cl_setenv("USERPROFILE", env_userprofile);
|
||||
|
||||
git__free(env_home);
|
||||
git__free(env_userprofile);
|
||||
#endif
|
||||
}
|
||||
|
||||
void test_core_env__0(void)
|
||||
{
|
||||
static char *home_values[] = {
|
||||
"fake_home",
|
||||
"fáke_hõme", /* all in latin-1 supplement */
|
||||
"fĀke_Ĥome", /* latin extended */
|
||||
"fακε_hοmέ", /* having fun with greek */
|
||||
"faงe_นome", /* now I have no idea, but thai characters */
|
||||
"f\xe1\x9cx80ke_\xe1\x9c\x91ome", /* tagalog characters */
|
||||
"\xe1\xb8\x9fẢke_hoṁe", /* latin extended additional */
|
||||
"\xf0\x9f\x98\x98\xf0\x9f\x98\x82", /* emoticons */
|
||||
NULL
|
||||
};
|
||||
git_buf path = GIT_BUF_INIT, found = GIT_BUF_INIT;
|
||||
char **val;
|
||||
char *check;
|
||||
|
||||
for (val = home_values; *val != NULL; val++) {
|
||||
|
||||
if (p_mkdir(*val, 0777) == 0) {
|
||||
/* if we can't make the directory, let's just assume
|
||||
* we are on a filesystem that doesn't support the
|
||||
* characters in question and skip this test...
|
||||
*/
|
||||
cl_git_pass(git_path_prettify(&path, *val, NULL));
|
||||
|
||||
cl_git_pass(cl_setenv("HOME", path.ptr));
|
||||
|
||||
/* do a quick check that it was set correctly */
|
||||
check = cl_getenv("HOME");
|
||||
cl_assert_equal_s(path.ptr, check);
|
||||
#ifdef GIT_WIN32
|
||||
git__free(check);
|
||||
|
||||
cl_git_pass(cl_setenv("USERPROFILE", path.ptr));
|
||||
|
||||
/* do a quick check that it was set correctly */
|
||||
check = cl_getenv("USERPROFILE");
|
||||
cl_assert_equal_s(path.ptr, check);
|
||||
git__free(check);
|
||||
#endif
|
||||
|
||||
cl_git_pass(git_buf_puts(&path, "/testfile"));
|
||||
cl_git_mkfile(path.ptr, "find me");
|
||||
|
||||
cl_git_pass(git_futils_find_global_file(&found, "testfile"));
|
||||
|
||||
#ifdef GIT_WIN32
|
||||
/* do another check with HOME unset */
|
||||
cl_git_pass(cl_setenv("HOME", NULL));
|
||||
cl_git_pass(git_futils_find_global_file(&found, "testfile"));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
git_buf_free(&path);
|
||||
git_buf_free(&found);
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user