External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Unicode handling when writing to an ostream on GCC on Windows

Browse Source
This commit is contained in:
Dimitrij Mijoski 2022-07-20 20:25:52 +02:00
parent e17de67514
commit e6d1489276
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/fmt/ostream.h
View File

@ -10,6 +10,10 @@
#include <fstream> #include <fstream>
#include <ostream> #include <ostream>
#if _WIN32 && __GLIBCXX__
# include <ext/stdio_filebuf.h>
# include <ext/stdio_sync_filebuf.h>
#endif
#include "format.h" #include "format.h"
@ -92,12 +96,36 @@ inline bool write_ostream_msvc_unicode(std::wostream&,
return false; return false;
} }
#if _WIN32 && __GLIBCXX__
inline bool write_ostream_gcc_mingw_unicode(std::ostream& os,
fmt::string_view data) {
auto* rdbuf = os.rdbuf();
FILE* c_file;
if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
c_file = fbuf->file();
else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf<char>*>(rdbuf))
c_file = fbuf->file();
else
return false;
if (c_file) return write_console_on_windows(c_file, data);
return false;
}
inline bool write_ostream_gcc_mingw_unicode(std::wostream&,
fmt::basic_string_view<wchar_t>) {
return false;
}
#endif
// Write the content of buf to os. // Write the content of buf to os.
// It is a separate function rather than a part of vprint to simplify testing. // It is a separate function rather than a part of vprint to simplify testing.
template <typename Char> template <typename Char>
void write_buffer(std::basic_ostream<Char>& os, buffer<Char>& buf) { void write_buffer(std::basic_ostream<Char>& os, buffer<Char>& buf) {
if (const_check(FMT_MSC_VERSION)) #if FMT_MSC_VERSION
if (write_ostream_msvc_unicode(os, {buf.data(), buf.size()})) return; if (write_ostream_msvc_unicode(os, {buf.data(), buf.size()})) return;
#elif _WIN32 && __GLIBCXX__
if (write_ostream_gcc_mingw_unicode(os, {buf.data(), buf.size()})) return;
#endif
const Char* buf_data = buf.data(); const Char* buf_data = buf.data();
using unsigned_streamsize = std::make_unsigned<std::streamsize>::type; using unsigned_streamsize = std::make_unsigned<std::streamsize>::type;
unsigned_streamsize size = buf.size(); unsigned_streamsize size = buf.size();