diff options
| author | Jeff Garzik <[email protected]> | 2011-06-23 21:43:30 -0700 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2011-06-23 21:43:30 -0700 |
| commit | 77ba3ab99c0803ef1f7d03b7884c75588b6e09de (patch) | |
| tree | d3cf489b80bb4c8580eb5a21b8ae24b3eae60a6d /src/init.cpp | |
| parent | Merge pull request #334 from sipa/walletclass (diff) | |
| parent | Edited init.cpp to include a check that -datadir exists (diff) | |
| download | discoin-77ba3ab99c0803ef1f7d03b7884c75588b6e09de.tar.xz discoin-77ba3ab99c0803ef1f7d03b7884c75588b6e09de.zip | |
Merge pull request #342 from jburkle/datadir_check
Edited init.cpp to include a check that -datadir exists
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index a0c90e0a7..ebe176a5e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -141,10 +141,19 @@ bool AppInit2(int argc, char* argv[]) if (mapArgs.count("-datadir")) { - filesystem::path pathDataDir = filesystem::system_complete(mapArgs["-datadir"]); - strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir)); + if (filesystem::is_directory(filesystem::system_complete(mapArgs["-datadir"]))) + { + filesystem::path pathDataDir = filesystem::system_complete(mapArgs["-datadir"]); + strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir)); + } + else + { + fprintf(stderr, "Error: Specified directory does not exist\n"); + Shutdown(NULL); + } } + ReadConfigFile(mapArgs, mapMultiArgs); // Must be done after processing datadir if (mapArgs.count("-?") || mapArgs.count("--help")) |