Browse Source

Merge pull request #26 from CodeShark/windows_osx_linux_datadir

Added windows and os x support for the datadir.
cl-refactor
Gav Wood 11 years ago
parent
commit
3d8215b0c7
  1. 3
      eth/main.cpp
  2. 3
      libethereum/BlockChain.cpp
  3. 55
      libethereum/FileSystem.cpp
  4. 26
      libethereum/FileSystem.h

3
eth/main.cpp

@ -25,6 +25,7 @@
#include "PeerNetwork.h" #include "PeerNetwork.h"
#include "BlockChain.h" #include "BlockChain.h"
#include "State.h" #include "State.h"
#include "FileSystem.h"
using namespace std; using namespace std;
using namespace eth; using namespace eth;
@ -76,7 +77,7 @@ int main(int argc, char** argv)
KeyPair us = KeyPair::create(); KeyPair us = KeyPair::create();
Address coinbase = us.address(); Address coinbase = us.address();
string configFile = string(getenv("HOME")) + "/.ethereum/config.rlp"; string configFile = getDataDir() + "/config.rlp";
bytes b = contents(configFile); bytes b = contents(configFile);
if (b.size()) if (b.size())
{ {

3
libethereum/BlockChain.cpp

@ -27,10 +27,11 @@
#include "BlockInfo.h" #include "BlockInfo.h"
#include "State.h" #include "State.h"
#include "BlockChain.h" #include "BlockChain.h"
#include "FileSystem.h"
using namespace std; using namespace std;
using namespace eth; using namespace eth;
std::string Defaults::s_dbPath = string(getenv("HOME")) + "/.ethereum"; std::string Defaults::s_dbPath = getDataDir();
namespace eth namespace eth
{ {

55
libethereum/FileSystem.cpp

@ -0,0 +1,55 @@
/*
This file is part of cpp-ethereum.
cpp-ethereum is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Foobar is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file FileSystem.cpp
* @author Eric Lombrozo <elombrozo@gmail.com>
* @date 2014
*/
#include "FileSystem.h"
#include <boost/filesystem.hpp>
#ifdef _WIN32
#include <shlobj.h>
#endif
std::string getDataDir()
{
#ifdef _WIN32
char path[1024] = "";
if (SHGetSpecialFolderPathA(NULL, path, CSIDL_APPDATA, true))
return (boost::filesystem::path(path) / "Ethereum").string();
else
{
std::cerr << "getDataDir() - SHGetSpecialFolderPathA() failed." << std::endl;
throw std::runtime_error("getDataDir() - SHGetSpecialFolderPathA() failed.");
}
#else
boost::filesystem::path dataDirPath;
char* homeDir = getenv("HOME");
if (homeDir == NULL || strlen(homeDir) == 0)
dataDirPath = boost::filesystem::path("/");
else
dataDirPath = boost::filesystem::path(homeDir);
#if defined(__APPLE__) && defined(__MACH__)
dataDirPath /= "Library/Application Support";
boost::filesystem::create_directory(dataDirPath);
return (dataDirPath / "Ethereum").string();
#else
return (dataDirPath / ".ethereum").string();
#endif
#endif
}

26
libethereum/FileSystem.h

@ -0,0 +1,26 @@
/*
This file is part of cpp-ethereum.
cpp-ethereum is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Foobar is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file FileSystem.h
* @author Eric Lombrozo <elombrozo@gmail.com>
* @date 2014
*/
#pragma once
#include <string>
std::string getDataDir();
Loading…
Cancel
Save