undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Win32: Unicode environment (outgoing)

Browse Source 
Convert environment from UTF-8 to UTF-16 when creating other processes.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Karsten Blees 2014-07-17 17:37:55 +02:00 committed by Junio C Hamano
parent 9ae1afa5e6
commit 7eb2619c5c
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compat/mingw.c
View File

@ -4,6 +4,7 @@
#include <wchar.h> #include <wchar.h>
#include "../strbuf.h" #include "../strbuf.h"
#include "../run-command.h" #include "../run-command.h"
#include "../cache.h"
static const int delay[] = { 0, 1, 10, 20, 40 }; static const int delay[] = { 0, 1, 10, 20, 40 };
@ -919,9 +920,9 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
{ {
STARTUPINFOW si; STARTUPINFOW si;
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
struct strbuf envblk, args; struct strbuf args;
wchar_t wcmd[MAX_PATH], wdir[MAX_PATH], *wargs; wchar_t wcmd[MAX_PATH], wdir[MAX_PATH], *wargs, *wenvblk = NULL;
unsigned flags; unsigned flags = CREATE_UNICODE_ENVIRONMENT;
BOOL ret; BOOL ret;
/* Determine whether or not we are associated to a console */ /* Determine whether or not we are associated to a console */
@ -938,7 +939,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
* instead of CREATE_NO_WINDOW to make ssh * instead of CREATE_NO_WINDOW to make ssh
* recognize that it has no console. * recognize that it has no console.
*/ */
flags = DETACHED_PROCESS; flags |= DETACHED_PROCESS;
} else { } else {
/* There is already a console. If we specified /* There is already a console. If we specified
* DETACHED_PROCESS here, too, Windows would * DETACHED_PROCESS here, too, Windows would
@ -946,7 +947,6 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
* The same is true for CREATE_NO_WINDOW. * The same is true for CREATE_NO_WINDOW.
* Go figure! * Go figure!
*/ */
flags = 0;
CloseHandle(cons); CloseHandle(cons);
} }
memset(&si, 0, sizeof(si)); memset(&si, 0, sizeof(si));
@ -985,6 +985,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
if (env) { if (env) {
int count = 0; int count = 0;
char **e, **sorted_env; char **e, **sorted_env;
int size = 0, wenvsz = 0, wenvpos = 0;
for (e = env; *e; e++) for (e = env; *e; e++)
count++; count++;
@ -994,20 +995,22 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
memcpy(sorted_env, env, sizeof(*sorted_env) * (count + 1)); memcpy(sorted_env, env, sizeof(*sorted_env) * (count + 1));
qsort(sorted_env, count, sizeof(*sorted_env), env_compare); qsort(sorted_env, count, sizeof(*sorted_env), env_compare);
strbuf_init(&envblk, 0); /* create environment block from temporary environment */
for (e = sorted_env; *e; e++) { for (e = sorted_env; *e; e++) {
strbuf_addstr(&envblk, *e); size = 2 * strlen(*e) + 2; /* +2 for final \0 */
strbuf_addch(&envblk, '\0'); ALLOC_GROW(wenvblk, (wenvpos + size) * sizeof(wchar_t), wenvsz);
wenvpos += xutftowcs(&wenvblk[wenvpos], *e, size) + 1;
} }
/* add final \0 terminator */
wenvblk[wenvpos] = 0;
free(sorted_env); free(sorted_env);
} }
memset(&pi, 0, sizeof(pi)); memset(&pi, 0, sizeof(pi));
ret = CreateProcessW(wcmd, wargs, NULL, NULL, TRUE, flags, ret = CreateProcessW(wcmd, wargs, NULL, NULL, TRUE, flags,
env ? envblk.buf : NULL, dir ? wdir : NULL, &si, &pi); wenvblk, dir ? wdir : NULL, &si, &pi);
if (env) free(wenvblk);
strbuf_release(&envblk);
free(wargs); free(wargs);
if (!ret) { if (!ret) {