Skip to content

Commit

Permalink
don't imbue boost::filesystem::path with locale "C" on windows
Browse files Browse the repository at this point in the history
fixes bitcoin#6078

Github-Pull: bitcoin#6093
Rebased-From: b3ffcdf 3da7849
(cherry picked from commit 424ae66)
  • Loading branch information
jonasschnelli authored and reddink committed May 26, 2020
1 parent cc13dbf commit 200b5b8
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -713,18 +713,20 @@ void RenameThread(const char* name)

void SetupEnvironment()
{
std::locale loc("C");
// On most POSIX systems (e.g. Linux, but not BSD) the environment's locale
// may be invalid, in which case the "C" locale is used as fallback.
#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
try {
loc = std::locale(""); // Raises a runtime error if current locale is invalid
std::locale(""); // Raises a runtime error if current locale is invalid
} catch (const std::runtime_error&) {
setenv("LC_ALL", "C", 1);
}
#endif
// The path locale is lazy initialized and to avoid deinitialization errors
// The path locale is lazy initialized and to avoid deinitialization errors
// in multithreading environments, it is set explicitly by the main thread.
// A dummy locale is used to extract the internal default locale, used by
// boost::filesystem::path, which is then used to explicitly imbue the path.
std::locale loc = boost::filesystem::path::imbue(std::locale::classic());
boost::filesystem::path::imbue(loc);
}

Expand Down

0 comments on commit 200b5b8

Please sign in to comment.