luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-03 12:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert to the console charset only if the stream outputs to the console

Browse Source
This commit is contained in:
Luca Bacci
2025-04-16 11:44:30 +02:00
parent c03f41ca17
commit 93a8de93b8
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
glib/gmessages.c
View File

@@ -77,15 +77,16 @@
#endif #endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include "gwin32.h"
#include "gwin32private.h"
#include <process.h> /* For getpid() */ #include <process.h> /* For getpid() */
#include <io.h> #include <io.h>
# include <windows.h> #include <windows.h>
#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING #ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
#endif #endif
#include "gwin32.h"
#endif #endif
/** /**
@@ -3470,12 +3471,30 @@ static void
print_string (FILE *stream, print_string (FILE *stream,
const gchar *string) const gchar *string)
{ {
const gchar *charset; const gchar *charset = NULL;
bool print_utf8;
int ret; int ret;
if (g_get_console_charset (&charset)) #ifdef _WIN32
int fd;
HANDLE handle;
fd = _fileno (stream);
if (fd < 0)
return;
handle = (HANDLE) _get_osfstream (fd);
if (g_win32_handle_is_console_output (handle))
print_utf8 = g_get_console_charset (&charset);
else
print_utf8 = true;
#else
print_utf8 = g_get_charset (&charset);
#endif
if (print_utf8)
{ {
/* charset is UTF-8 already */
ret = fputs (string, stream); ret = fputs (string, stream);
} }
else else