diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-06-27 11:37:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-27 21:56:13 +0200 |
| commit | 39a98e9b68b84e40e759a0805758ec4726c9299e (patch) | |
| tree | 41338509df935657834aac972d69bb78ad0d1541 | |
| parent | The third batch (diff) | |
| download | git-39a98e9b68b84e40e759a0805758ec4726c9299e.tar.xz git-39a98e9b68b84e40e759a0805758ec4726c9299e.zip | |
mingw: get pw_name in UTF-8 format
Previously, we would have obtained the user name encoded in whatever the
current code page is.
Note: the "user name" here does not denote the full name but instead the
short logon name.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 9b6d2400e1..8526876262 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1946,13 +1946,19 @@ struct passwd *getpwuid(int uid) static unsigned initialized; static char user_name[100]; static struct passwd *p; + wchar_t buf[100]; DWORD len; if (initialized) return p; - len = sizeof(user_name); - if (!GetUserName(user_name, &len)) { + len = sizeof(buf); + if (!GetUserNameW(buf, &len)) { + initialized = 1; + return NULL; + } + + if (xwcstoutf(user_name, buf, sizeof(user_name)) < 0) { initialized = 1; return NULL; } |