SetupEnvironment() - clean commit
This commit is contained in:
parent
bfae70aae6
commit
5248ff4099
5 changed files with 23 additions and 0 deletions
|
@ -58,6 +58,8 @@ static bool AppInitRPC(int argc, char* argv[])
|
|||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
SetupEnvironment();
|
||||
|
||||
try
|
||||
{
|
||||
if(!AppInitRPC(argc, argv))
|
||||
|
|
|
@ -172,6 +172,8 @@ bool AppInit(int argc, char* argv[])
|
|||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
SetupEnvironment();
|
||||
|
||||
bool fRet = false;
|
||||
|
||||
// Connect bitcoind signal handlers
|
||||
|
|
|
@ -459,6 +459,8 @@ WId BitcoinApplication::getMainWinId() const
|
|||
#ifndef BITCOIN_QT_TEST
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
SetupEnvironment();
|
||||
|
||||
/// 1. Parse command-line options. These take precedence over anything else.
|
||||
// Command-line options take precedence:
|
||||
ParseParameters(argc, argv);
|
||||
|
|
16
src/util.cpp
16
src/util.cpp
|
@ -1404,3 +1404,19 @@ bool ParseInt32(const std::string& str, int32_t *out)
|
|||
n <= std::numeric_limits<int32_t>::max();
|
||||
}
|
||||
|
||||
void SetupEnvironment()
|
||||
{
|
||||
#ifndef WIN32
|
||||
try
|
||||
{
|
||||
#if BOOST_FILESYSTEM_VERSION == 3
|
||||
boost::filesystem::path::codecvt(); // Raises runtime error if current locale is invalid
|
||||
#else // boost filesystem v2
|
||||
std::locale(); // Raises runtime error if current locale is invalid
|
||||
#endif
|
||||
} catch(std::runtime_error &e)
|
||||
{
|
||||
setenv("LC_ALL", "C", 1); // Force C locale
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -106,6 +106,7 @@ extern volatile bool fReopenDebugLog;
|
|||
|
||||
void RandAddSeed();
|
||||
void RandAddSeedPerfmon();
|
||||
void SetupEnvironment();
|
||||
|
||||
/* Return true if log accepts specified category */
|
||||
bool LogAcceptCategory(const char* category);
|
||||
|
|
Loading…
Reference in a new issue