Use WriteConsoleW() in priv_fwrite() too (#3607)

jq dumps JSON to the Windows console as UTF-16 with WriteConsoleW(),
but priv_fwrite() still writes the raw UTF-8 bytes with WriteFile(),
which the console decodes with its output code page.  So `jq .k` prints
non-ASCII correctly while `jq -r .k` prints mojibake, and the same goes
for -j, --raw-output0, --seq, halt_error and the `stderr` builtin.

The tty flag is computed once, from stdout, and passed to writes aimed
at stderr too, so ask the handle instead: with stdout on a console and
stderr redirected, WriteConsoleW() failed on the file handle and the
output was dropped.

One byte-level change: with stdout on a console and stderr redirected,
halt_error and the `stderr` builtin now go through the CRT, so bare LF
becomes CRLF and an existing CRLF becomes CR CRLF.  Use -b for
byte-exact output on that stream.
This commit is contained in:
Bumsu Hyeon authored and GitHub committed 2026-09-18 20:12:34 +09:00
1 parent 7422e8c914
commit dd409de28d
2 files changed
+39 -40

No files matched your search

+1 -24
View File
@@ -3,12 +3,6 @@
#include <float.h>
#include <string.h>
#ifdef WIN32
#include <windows.h>
#include <io.h>
#include <fileapi.h>
#endif
#include "jv.h"
#include "jv_dtoa.h"
#include "jv_dtoa_tsd.h"
@@ -99,26 +93,9 @@ static void put_buf(const char *s, int len, FILE *fout, jv *strout, int is_tty)
if (strout) {
*strout = jv_string_append_buf(*strout, s, len);
} else {
#ifdef WIN32
/* See util.h */
if (is_tty) {
wchar_t *ws;
size_t wl;
if (len == -1)
len = strlen(s);
wl = MultiByteToWideChar(CP_UTF8, 0, s, len, NULL, 0);
ws = jv_mem_calloc(wl + 1, sizeof(*ws));
if (!ws)
return;
wl = MultiByteToWideChar(CP_UTF8, 0, s, len, ws, wl + 1);
ws[wl] = 0;
WriteConsoleW((HANDLE)_get_osfhandle(fileno(fout)), ws, wl, NULL, NULL);
free(ws);
} else
fwrite(s, 1, len, fout);
#else
fwrite(s, 1, len, fout);
#endif
priv_fwrite(s, len, fout, is_tty); /* see util.h */
}
}
+38 -16
View File
@@ -2,11 +2,13 @@
#define UTIL_H
#ifdef WIN32
/* For WriteFile() below */
/* For WriteConsoleW() below */
#include <windows.h>
#include <io.h>
#include <limits.h>
#include <processenv.h>
#include <shellapi.h>
#include <stdlib.h>
#include <wchar.h>
#include <wtypes.h>
#endif
@@ -18,27 +20,47 @@ jv get_home(void);
jv jq_realpath(jv);
/*
* The Windows CRT and console are something else. In order for the
* console to get UTF-8 written to it correctly we have to bypass stdio
* completely. No amount of fflush()ing helps. If the first byte of a
* buffer being written with fwrite() is non-ASCII UTF-8 then the
* console misinterprets the byte sequence. But one must not
* WriteFile() if stdout is a file!1!!
* The Windows console does not do UTF-8. Bytes written to it, with
* fwrite() or with WriteFile() alike, are decoded with the console's
* output code page, so anything but ASCII comes out as mojibake unless
* the user happened to run `chcp 65001` first. The wide character
* console API is code page independent, so convert to UTF-16 and use
* WriteConsoleW() instead. We must not call SetConsoleOutputCP(): the
* code page belongs to the console rather than to us, so changing it
* also changes the shell we were started from (see #1121 and #1184).
*
* We carry knowledge of whether the FILE * is a tty everywhere we
* output to it just so we can write with WriteFile() if stdout is a
* console on WIN32.
* Only a console needs this; a file or a pipe wants the UTF-8 bytes.
* The is_tty flag alone cannot tell the two apart, as it is computed
* once, from stdout, and passed along even for writes to stderr, so
* ask the handle we are about to write to.
*/
static void priv_fwrite(const char *s, size_t len, FILE *fout, int is_tty) {
#ifdef WIN32
if (is_tty)
WriteFile((HANDLE)_get_osfhandle(fileno(fout)), s, len, NULL, NULL);
else
fwrite(s, 1, len, fout);
#else
fwrite(s, 1, len, fout);
if (is_tty && len > 0 && len <= INT_MAX / sizeof(wchar_t)) {
HANDLE h = (HANDLE)_get_osfhandle(fileno(fout));
DWORD mode;
if (GetConsoleMode(h, &mode)) {
int wlen = MultiByteToWideChar(CP_UTF8, 0, s, (int)len, NULL, 0);
wchar_t *ws = wlen > 0 ? malloc(wlen * sizeof(*ws)) : NULL;
if (ws != NULL) {
wlen = MultiByteToWideChar(CP_UTF8, 0, s, (int)len, ws, wlen);
fflush(fout); /* keep our order with stdio writes to this stream */
for (int done = 0; done < wlen;) {
DWORD written;
/* WriteConsoleW() may write fewer characters than asked for. */
if (!WriteConsoleW(h, ws + done, wlen - done, &written, NULL) ||
written == 0)
break;
done += written;
}
free(ws);
return;
}
}
}
#endif
fwrite(s, 1, len, fout);
}
const void *_jq_memmem(const void *haystack, size_t haystacklen,