mirror of
https://github.com/git/git.git
synced 2026-02-07 00:05:02 +00:00
fixup! Add Git for Windows' wrapper executable
Fix whitespace. This trick was performed by git rebase --whitespace=fix HEAD^ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
@@ -20,17 +20,17 @@ PrintError(LPCWSTR wszPrefix, DWORD dwError)
|
||||
DWORD cch = 0;
|
||||
|
||||
cch = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER
|
||||
| FORMAT_MESSAGE_FROM_SYSTEM
|
||||
| FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||
NULL, dwError, LANG_NEUTRAL,
|
||||
(LPTSTR)&lpsz, 0, NULL);
|
||||
| FORMAT_MESSAGE_FROM_SYSTEM
|
||||
| FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||
NULL, dwError, LANG_NEUTRAL,
|
||||
(LPTSTR)&lpsz, 0, NULL);
|
||||
if (cch < 1) {
|
||||
cch = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER
|
||||
| FORMAT_MESSAGE_FROM_STRING
|
||||
| FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
||||
L"Code 0x%1!08x!",
|
||||
0, LANG_NEUTRAL, (LPTSTR)&lpsz, 0,
|
||||
(va_list*)&dwError);
|
||||
cch = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER
|
||||
| FORMAT_MESSAGE_FROM_STRING
|
||||
| FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
||||
L"Code 0x%1!08x!",
|
||||
0, LANG_NEUTRAL, (LPTSTR)&lpsz, 0,
|
||||
(va_list*)&dwError);
|
||||
}
|
||||
fwprintf(stderr, L"%s: %s", wszPrefix, lpsz);
|
||||
LocalFree((HLOCAL)lpsz);
|
||||
@@ -56,12 +56,12 @@ main(void)
|
||||
|
||||
/* if not set, set TERM to msys */
|
||||
if (GetEnvironmentVariable(L"TERM", NULL, 0) == 0) {
|
||||
SetEnvironmentVariable(L"TERM", L"msys");
|
||||
SetEnvironmentVariable(L"TERM", L"msys");
|
||||
}
|
||||
|
||||
/* if not set, set PLINK_PROTOCOL to ssh */
|
||||
if (GetEnvironmentVariable(L"PLINK_PROTOCOL", NULL, 0) == 0) {
|
||||
SetEnvironmentVariable(L"PLINK_PROTOCOL", L"ssh");
|
||||
SetEnvironmentVariable(L"PLINK_PROTOCOL", L"ssh");
|
||||
}
|
||||
|
||||
/* set HOME to %HOMEDRIVE%%HOMEPATH% or %USERPROFILE%
|
||||
@@ -69,25 +69,25 @@ main(void)
|
||||
* USERPROFILE is the local location
|
||||
*/
|
||||
if (GetEnvironmentVariable(L"HOME", NULL, 0) == 0) {
|
||||
LPWSTR e = NULL;
|
||||
len = GetEnvironmentVariable(L"HOMEPATH", NULL, 0);
|
||||
if (len == 0) {
|
||||
len = GetEnvironmentVariable(L"USERPROFILE", NULL, 0);
|
||||
if (len != 0) {
|
||||
e = (LPWSTR)malloc(len * sizeof(WCHAR));
|
||||
GetEnvironmentVariable(L"USERPROFILE", e, len);
|
||||
SetEnvironmentVariable(L"HOME", e);
|
||||
free(e);
|
||||
}
|
||||
} else {
|
||||
int n;
|
||||
len += GetEnvironmentVariable(L"HOMEDRIVE", NULL, 0);
|
||||
e = (LPWSTR)malloc(sizeof(WCHAR) * (len + 2));
|
||||
n = GetEnvironmentVariable(L"HOMEDRIVE", e, len);
|
||||
GetEnvironmentVariable(L"HOMEPATH", &e[n], len-n);
|
||||
SetEnvironmentVariable(L"HOME", e);
|
||||
free(e);
|
||||
}
|
||||
LPWSTR e = NULL;
|
||||
len = GetEnvironmentVariable(L"HOMEPATH", NULL, 0);
|
||||
if (len == 0) {
|
||||
len = GetEnvironmentVariable(L"USERPROFILE", NULL, 0);
|
||||
if (len != 0) {
|
||||
e = (LPWSTR)malloc(len * sizeof(WCHAR));
|
||||
GetEnvironmentVariable(L"USERPROFILE", e, len);
|
||||
SetEnvironmentVariable(L"HOME", e);
|
||||
free(e);
|
||||
}
|
||||
} else {
|
||||
int n;
|
||||
len += GetEnvironmentVariable(L"HOMEDRIVE", NULL, 0);
|
||||
e = (LPWSTR)malloc(sizeof(WCHAR) * (len + 2));
|
||||
n = GetEnvironmentVariable(L"HOMEDRIVE", e, len);
|
||||
GetEnvironmentVariable(L"HOMEPATH", &e[n], len-n);
|
||||
SetEnvironmentVariable(L"HOME", e);
|
||||
free(e);
|
||||
}
|
||||
}
|
||||
|
||||
/* extend the PATH */
|
||||
@@ -100,7 +100,7 @@ main(void)
|
||||
wcscat(path2, exepath);
|
||||
PathAppend(path2, L"mingw\\bin;");
|
||||
GetEnvironmentVariable(L"PATH", &path2[wcslen(path2)],
|
||||
(len/sizeof(WCHAR))-wcslen(path2));
|
||||
(len/sizeof(WCHAR))-wcslen(path2));
|
||||
SetEnvironmentVariable(L"PATH", path2);
|
||||
free(path2);
|
||||
|
||||
@@ -111,43 +111,43 @@ main(void)
|
||||
* untouched.
|
||||
*/
|
||||
{
|
||||
int wargc = 0, gui = 0;
|
||||
LPWSTR cmdline = NULL;
|
||||
LPWSTR *wargv = NULL, p = NULL;
|
||||
cmdline = GetCommandLine();
|
||||
wargv = CommandLineToArgvW(cmdline, &wargc);
|
||||
cmd = (LPWSTR)malloc(sizeof(WCHAR) * (wcslen(cmdline) + MAX_PATH));
|
||||
if (wargc > 1 && wcsicmp(L"gui", wargv[1]) == 0) {
|
||||
wait = 0;
|
||||
if (wargc > 2 && wcsicmp(L"citool", wargv[2]) == 0) {
|
||||
wait = 1;
|
||||
wcscpy(cmd, L"git.exe");
|
||||
} else {
|
||||
WCHAR script[MAX_PATH];
|
||||
gui = 1;
|
||||
wcscpy(script, exepath);
|
||||
PathAppend(script, L"libexec\\git-core\\git-gui");
|
||||
PathQuoteSpaces(script);
|
||||
wcscpy(cmd, L"wish.exe ");
|
||||
wcscat(cmd, script);
|
||||
wcscat(cmd, L" --");
|
||||
exep = NULL; /* find the module from the commandline */
|
||||
}
|
||||
} else {
|
||||
wcscpy(cmd, L"git.exe");
|
||||
}
|
||||
/* find the first space after the initial parameter then append all */
|
||||
p = wcschr(&cmdline[wcslen(wargv[0])], L' ');
|
||||
if (p && *p) {
|
||||
/* for git gui subcommands, remove the 'gui' word */
|
||||
if (gui) {
|
||||
while (*p == L' ') ++p;
|
||||
p = wcschr(p, L' ');
|
||||
}
|
||||
if (p && *p)
|
||||
wcscat(cmd, p);
|
||||
}
|
||||
LocalFree(wargv);
|
||||
int wargc = 0, gui = 0;
|
||||
LPWSTR cmdline = NULL;
|
||||
LPWSTR *wargv = NULL, p = NULL;
|
||||
cmdline = GetCommandLine();
|
||||
wargv = CommandLineToArgvW(cmdline, &wargc);
|
||||
cmd = (LPWSTR)malloc(sizeof(WCHAR) * (wcslen(cmdline) + MAX_PATH));
|
||||
if (wargc > 1 && wcsicmp(L"gui", wargv[1]) == 0) {
|
||||
wait = 0;
|
||||
if (wargc > 2 && wcsicmp(L"citool", wargv[2]) == 0) {
|
||||
wait = 1;
|
||||
wcscpy(cmd, L"git.exe");
|
||||
} else {
|
||||
WCHAR script[MAX_PATH];
|
||||
gui = 1;
|
||||
wcscpy(script, exepath);
|
||||
PathAppend(script, L"libexec\\git-core\\git-gui");
|
||||
PathQuoteSpaces(script);
|
||||
wcscpy(cmd, L"wish.exe ");
|
||||
wcscat(cmd, script);
|
||||
wcscat(cmd, L" --");
|
||||
exep = NULL; /* find the module from the commandline */
|
||||
}
|
||||
} else {
|
||||
wcscpy(cmd, L"git.exe");
|
||||
}
|
||||
/* find the first space after the initial parameter then append all */
|
||||
p = wcschr(&cmdline[wcslen(wargv[0])], L' ');
|
||||
if (p && *p) {
|
||||
/* for git gui subcommands, remove the 'gui' word */
|
||||
if (gui) {
|
||||
while (*p == L' ') ++p;
|
||||
p = wcschr(p, L' ');
|
||||
}
|
||||
if (p && *p)
|
||||
wcscat(cmd, p);
|
||||
}
|
||||
LocalFree(wargv);
|
||||
}
|
||||
|
||||
/* set the console to ANSI/GUI codepage */
|
||||
@@ -155,31 +155,31 @@ main(void)
|
||||
SetConsoleCP(GetACP());
|
||||
|
||||
{
|
||||
STARTUPINFO si;
|
||||
PROCESS_INFORMATION pi;
|
||||
BOOL br = FALSE;
|
||||
ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
|
||||
ZeroMemory(&si, sizeof(STARTUPINFO));
|
||||
si.cb = sizeof(STARTUPINFO);
|
||||
br = CreateProcess(exep,/* module: null means use command line */
|
||||
cmd, /* modified command line */
|
||||
NULL, /* process handle inheritance */
|
||||
NULL, /* thread handle inheritance */
|
||||
TRUE, /* handles inheritable? */
|
||||
CREATE_UNICODE_ENVIRONMENT,
|
||||
NULL, /* environment: use parent */
|
||||
NULL, /* starting directory: use parent */
|
||||
&si, &pi);
|
||||
if (br) {
|
||||
if (wait)
|
||||
WaitForSingleObject(pi.hProcess, INFINITE);
|
||||
if (!GetExitCodeProcess(pi.hProcess, (DWORD *)&r))
|
||||
PrintError(L"error reading exit code", GetLastError());
|
||||
CloseHandle(pi.hProcess);
|
||||
} else {
|
||||
PrintError(L"error launching git", GetLastError());
|
||||
r = 1;
|
||||
}
|
||||
STARTUPINFO si;
|
||||
PROCESS_INFORMATION pi;
|
||||
BOOL br = FALSE;
|
||||
ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
|
||||
ZeroMemory(&si, sizeof(STARTUPINFO));
|
||||
si.cb = sizeof(STARTUPINFO);
|
||||
br = CreateProcess(exep,/* module: null means use command line */
|
||||
cmd, /* modified command line */
|
||||
NULL, /* process handle inheritance */
|
||||
NULL, /* thread handle inheritance */
|
||||
TRUE, /* handles inheritable? */
|
||||
CREATE_UNICODE_ENVIRONMENT,
|
||||
NULL, /* environment: use parent */
|
||||
NULL, /* starting directory: use parent */
|
||||
&si, &pi);
|
||||
if (br) {
|
||||
if (wait)
|
||||
WaitForSingleObject(pi.hProcess, INFINITE);
|
||||
if (!GetExitCodeProcess(pi.hProcess, (DWORD *)&r))
|
||||
PrintError(L"error reading exit code", GetLastError());
|
||||
CloseHandle(pi.hProcess);
|
||||
} else {
|
||||
PrintError(L"error launching git", GetLastError());
|
||||
r = 1;
|
||||
}
|
||||
}
|
||||
|
||||
free(cmd);
|
||||
|
||||
Reference in New Issue
Block a user