Mercurial > hg > bitcoin

changeset 701:60dfcabae0fc draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #342 from jburkle/datadir_check Edited init.cpp to include a check that -datadir exists
author Jeff Garzik <jgarzik@exmulti.com>
date Thu, 23 Jun 2011 21:43:30 -0700
parents 58a93d5d26ac (current diff) 70d9ec57e0b3 (diff)
children 0213b284ff93
files
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -141,10 +141,19 @@
 
     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"))