Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-30 14:53:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

FLOG narrow-string output to use fwprintf

Browse source 
This avoids mixing narrow and wide I/O on the same stream.
Extends the fix in #5900 by allowing narrow string literals again.
This commit is contained in:
ridiculousfish 2019-05-31 09:31:11 -07:00
parent f9f30e6a8e
commit b20bdcebfa
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/flog.cpp
View file

@ -34,10 +34,16 @@ logger_t::logger_t() : file_(stderr) {}
owning_lock<logger_t> g_logger; owning_lock<logger_t> g_logger;
void logger_t::log1(const wchar_t *s) { std::fputws(s, file_); } void logger_t::log1(const wchar_t *s) { std::fputws(s, file_); }
void logger_t::log1(const char *s) { std::fputs(s, file_); }
void logger_t::log1(const char *s) {
// Note glibc prohibits mixing narrow and wide I/O, so always use wide-printing functions.
// See #5900.
std::fwprintf(file_, L"%s", s);
}
void logger_t::log1(wchar_t c) { std::fputwc(c, file_); } void logger_t::log1(wchar_t c) { std::fputwc(c, file_); }
void logger_t::log1(char c) { std::fputc(c, file_); }
void logger_t::log1(char c) { std::fwprintf(file_, L"%c", c); }
void logger_t::log_fmt(const category_t &cat, const wchar_t *fmt, ...) { void logger_t::log_fmt(const category_t &cat, const wchar_t *fmt, ...) {
va_list va; va_list va;