X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Futil.cpp;h=8b0afa97a7d71e04af8be7a4ba86e56613c52114;hb=b0bf038605dc43474bdd9105a5f7162c57ad8bad;hp=583d5e579a82537fb31ea404d9191ff98fbcac85;hpb=77a43545b4491b9703d803765da9059d2bdd5aaa;p=novacoin.git diff --git a/src/util.cpp b/src/util.cpp index 583d5e5..8b0afa9 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -56,7 +56,7 @@ namespace boost { # include #endif -#ifndef WIN32 +#if !defined(WIN32) && !defined(ANDROID) #include #endif @@ -600,9 +600,11 @@ bool GetBoolArg(const std::string& strArg, bool fDefault) bool SoftSetArg(const std::string& strArg, const std::string& strValue) { - if (mapArgs.count(strArg)) + if (mapArgs.count(strArg) || mapMultiArgs.count(strArg)) return false; mapArgs[strArg] = strValue; + mapMultiArgs[strArg].push_back(strValue); + return true; } @@ -1059,7 +1061,7 @@ void LogStackTrace() { printf("\n\n******* exception encountered *******\n"); if (fileout) { -#ifndef WIN32 +#if !defined(WIN32) && !defined(ANDROID) void* pszBuffer[32]; size_t size; size = backtrace(pszBuffer, 32); @@ -1140,6 +1142,39 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) return path; } +string randomStrGen(int length) { + static string charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; + string result; + result.resize(length); + for (int32_t i = 0; i < length; i++) + result[i] = charset[rand() % charset.length()]; + + return result; +} + +void createConf() +{ + srand(time(NULL)); + + ofstream pConf; +#if BOOST_FILESYSTEM_VERSION >= 3 + pConf.open(GetConfigFile().generic_string().c_str()); +#else + pConf.open(GetConfigFile().string().c_str()); +#endif + pConf << "rpcuser=user\nrpcpassword=" + + randomStrGen(15) + + "\nrpcport=8344" + + "\nport=7777" + + "\n#(0=off, 1=on) daemon - run in the background as a daemon and accept commands" + + "\ndaemon=0" + + "\n#(0=off, 1=on) server - accept command line and JSON-RPC commands" + + "\nserver=0" + + "\nrpcallowip=127.0.0.1" + + "\ntestnet=0"; + pConf.close(); +} + boost::filesystem::path GetConfigFile() { boost::filesystem::path pathConfigFile(GetArg("-conf", "novacoin.conf")); @@ -1152,7 +1187,12 @@ void ReadConfigFile(map& mapSettingsRet, { boost::filesystem::ifstream streamConfig(GetConfigFile()); if (!streamConfig.good()) - return; // No bitcoin.conf file is OK + { + createConf(); + new(&streamConfig) boost::filesystem::ifstream(GetConfigFile()); + if(!streamConfig.good()) + return; + } set setOptions; setOptions.insert("*"); @@ -1424,3 +1464,13 @@ bool NewThread(void(*pfn)(void*), void* parg) } return true; } + +std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime) +{ + // std::locale takes ownership of the pointer + std::locale loc(std::locale::classic(), new boost::posix_time::time_facet(pszFormat)); + std::stringstream ss; + ss.imbue(loc); + ss << boost::posix_time::from_time_t(nTime); + return ss.str(); +} \ No newline at end of file