util: Avoid buggy std::filesystem:::create_directories() call

hebasto · hebasto · commit 94fe141d2079 · 2022-02-04T23:19:04.000+02:00
Compiled with some libstdc++ versions (e.g., on Ubuntu 20.04)
std::filesystem:::create_directories() call fails to handle symbol links
properly.
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -443,11 +443,10 @@ const fs::path& ArgsManager::GetDataDir(bool net_specific) const
     } else {
         path = GetDefaultDataDir();
     }
-    if (net_specific)
-        path /= fs::PathFromString(BaseParams().DataDir());
 
-    if (fs::create_directories(path)) {
-        // This is the first run, create wallets subdirectory too
+    fs::create_directories(path / "wallets");
+    if (net_specific && !BaseParams().DataDir().empty()) {
+        path /= fs::PathFromString(BaseParams().DataDir());
         fs::create_directories(path / "wallets");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -443,11 +443,10 @@ const fs::path& ArgsManager::GetDataDir(bool net_specific) const`
`443`	`443`	`} else {`
`444`	`444`	`path = GetDefaultDataDir();`
`445`	`445`	`}`
`446`		`- if (net_specific)`
`447`		`- path /= fs::PathFromString(BaseParams().DataDir());`
`448`	`446`
`449`		`- if (fs::create_directories(path)) {`
`450`		`- // This is the first run, create wallets subdirectory too`
	`447`	`+ fs::create_directories(path / "wallets");`
	`448`	`+ if (net_specific && !BaseParams().DataDir().empty()) {`
	`449`	`+ path /= fs::PathFromString(BaseParams().DataDir());`
`451`	`450`	`fs::create_directories(path / "wallets");`
`452`	`451`	`}`
`453`	`452`