LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Packages Projects Releases 32 Wiki Activity

updated util.cpp to use make_preferred()

Browse source
This commit is contained in:
Philip Kaufmann 2012-03-31 15:22:45 +02:00
parent 93fb7489a7
commit 36949554ab
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/util.cpp
View file

@ -2,6 +2,7 @@
// Copyright (c) 2009-2012 The Bitcoin developers // Copyright (c) 2009-2012 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file license.txt or http://www.opensource.org/licenses/mit-license.php. // file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h" #include "headers.h"
#include "strlcpy.h" #include "strlcpy.h"
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
@ -858,10 +859,11 @@ string GetDataDir()
string GetConfigFile() string GetConfigFile()
{ {
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
fs::path pathConfig(GetArg("-conf", "bitcoin.conf"));
if (!pathConfig.is_complete()) fs::path pathConfigFile(GetArg("-conf", "bitcoin.conf"));
pathConfig = fs::path(GetDataDir()) / pathConfig; if (!pathConfigFile.is_complete()) pathConfigFile = fs::path(GetDataDir()) / pathConfigFile;
return pathConfig.string(); pathConfigFile.make_preferred();
return pathConfigFile.string();
} }
bool ReadConfigFile(map<string, string>& mapSettingsRet, bool ReadConfigFile(map<string, string>& mapSettingsRet,
@ -874,7 +876,9 @@ bool ReadConfigFile(map<string, string>& mapSettingsRet,
{ {
if (fs::is_directory(fs::system_complete(mapSettingsRet["-datadir"]))) if (fs::is_directory(fs::system_complete(mapSettingsRet["-datadir"])))
{ {
fs::path pathDataDir = fs::system_complete(mapSettingsRet["-datadir"]); fs::path pathDataDir(fs::system_complete(mapSettingsRet["-datadir"]));
pathDataDir.make_preferred();
strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir)); strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir));
} }
else else
@ -908,10 +912,11 @@ bool ReadConfigFile(map<string, string>& mapSettingsRet,
string GetPidFile() string GetPidFile()
{ {
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
fs::path pathConfig(GetArg("-pid", "bitcoind.pid"));
if (!pathConfig.is_complete()) fs::path pathPidFile(GetArg("-pid", "bitcoind.pid"));
pathConfig = fs::path(GetDataDir()) / pathConfig; if (!pathPidFile.is_complete()) pathPidFile = fs::path(GetDataDir()) / pathPidFile;
return pathConfig.string(); pathPidFile.make_preferred();
return pathPidFile.string();
} }
void CreatePidFile(string pidFile, pid_t pid) void CreatePidFile(string pidFile, pid_t pid)