fixup! Don't allow relative -walletdir paths

Change suggested bitcoin#12220 (comment) bitcoin#12220 (comment)
ryanofsky · Jan 18, 2018 · 46c40bf · 46c40bf
1 parent b84b0dd
commit 46c40bf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
@@ -159,14 +159,6 @@ bool AppInit(int argc, char* argv[])
             return false;
 #endif // HAVE_DECL_DAEMON
         }
-        // Warn about relative -datadir path.
-        if (gArgs.IsArgSet("-datadir") && !fs::path(gArgs.GetArg("-datadir", "")).is_absolute()) {
-            LogPrintf("Warning: relative datadir option '%s' specified, which will be interpreted relative to the "
-                      "current working directory '%s'. This is fragile, because if bitcoin is started in the future "
-                      "from a different location, it will be unable to locate the current data files. There could "
-                      "also be data loss if bitcoin is started while in a temporary directory.\n",
-                gArgs.GetArg("-datadir", ""), fs::current_path().string());
-        }
         // Lock data directory after daemonization
         if (!AppInitLockDataDirectory())
         {

diff --git a/src/init.cpp b/src/init.cpp
@@ -1210,6 +1210,15 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     LogPrintf("Using config file %s\n", GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)).string());
     LogPrintf("Using at most %i automatic connections (%i file descriptors available)\n", nMaxConnections, nFD);
 
+    // Warn about relative -datadir path.
+    if (gArgs.IsArgSet("-datadir") && !fs::path(gArgs.GetArg("-datadir", "")).is_absolute()) {
+        LogPrintf("Warning: relative datadir option '%s' specified, which will be interpreted relative to the "
+                  "current working directory '%s'. This is fragile, because if bitcoin is started in the future "
+                  "from a different location, it will be unable to locate the current data files. There could "
+                  "also be data loss if bitcoin is started while in a temporary directory.\n",
+            gArgs.GetArg("-datadir", ""), fs::current_path().string());
+    }
+
     InitSignatureCache();
     InitScriptExecutionCache();
 

diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
@@ -9,7 +9,7 @@ fs::path GetWalletDir()
     fs::path path;
 
     if (gArgs.IsArgSet("-walletdir")) {
-        path = fs::system_complete(gArgs.GetArg("-walletdir", ""));
+        path = gArgs.GetArg("-walletdir", "");
         if (!fs::is_directory(path)) {
             // If the path specified doesn't exist, we return the deliberately
             // invalid empty string.