kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'yt/winansi-die-lasterr-fix' into jch 

The error reporting machinery in the WinANSI compatibility layer has
been simplified to pass the exact Windows error code and correctly
format arguments for fatal errors.

* yt/winansi-die-lasterr-fix:
  compat/winansi: fix die_lasterr() argument formatting
jch
Junio C Hamano 2026-09-23 14:51:01 -07:00
parent c4d1fadf08 79ac6eff39
commit 956803f7f8
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compat/winansi.c
View File

@ -436,15 +436,6 @@ static void winansi_exit(void)
CloseHandle(hthread);
}

static void die_lasterr(const char *fmt, ...)
{
va_list params;
va_start(params, fmt);
errno = err_win_to_posix(GetLastError());
die_errno(fmt, params);
va_end(params);
}

#undef dup2
int winansi_dup2(int oldfd, int newfd)
{
@ -462,8 +453,8 @@ static HANDLE duplicate_handle(HANDLE hnd)
HANDLE hresult, hproc = GetCurrentProcess();
if (!DuplicateHandle(hproc, hnd, hproc, &hresult, 0, TRUE,
DUPLICATE_SAME_ACCESS))
die_lasterr("DuplicateHandle(%li) failed",
(long) (intptr_t) hnd);
die("DuplicateHandle(%li) failed: %lu",
(long) (intptr_t) hnd, GetLastError());
return hresult;
}

@ -609,16 +600,16 @@ void winansi_init(void)
hwrite = CreateNamedPipeW(name, PIPE_ACCESS_OUTBOUND,
PIPE_TYPE_BYTE | PIPE_WAIT, 1, BUFFER_SIZE, 0, 0, NULL);
if (hwrite == INVALID_HANDLE_VALUE)
die_lasterr("CreateNamedPipe failed");
die("CreateNamedPipe failed: %lu", GetLastError());

hread = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
if (hread == INVALID_HANDLE_VALUE)
die_lasterr("CreateFile for named pipe failed");
die("CreateFile for named pipe failed: %lu", GetLastError());

/* start console spool thread on the pipe's read end */
hthread = CreateThread(NULL, 0, console_thread, NULL, 0, NULL);
if (!hthread)
die_lasterr("CreateThread(console_thread) failed");
die("CreateThread(console_thread) failed: %lu", GetLastError());

/* schedule cleanup routine */
if (atexit(winansi_exit))