fix conversion from std::filesystem::path to agi::fs::path

Author: darealshinji

libaegisub/osx/path.mm

@@ -17,13 +17,15 @@
 #include <libaegisub/path.h>
 #include <libaegisub/util_osx.h>
 
+namespace sfs = std::filesystem;
+
 namespace agi {
 void Path::FillPlatformSpecificPaths() {
-	std::filesystem::path app_support = agi::util::GetApplicationSupportDirectory();
-	SetToken("?user", app_support/"Aegisub");
-	SetToken("?local", app_support/"Aegisub");
+	agi::fs::path user_dir = agi::fs::path(sfs::path(agi::util::GetApplicationSupportDirectory()))/"Aegisub";
+	SetToken("?user", user_dir);
+	SetToken("?local", user_dir);
 	SetToken("?data", agi::util::GetBundleSharedSupportDirectory());
 	SetToken("?dictionary", Decode("?data/dictionaries"));
-	SetToken("?temp", std::filesystem::temp_directory_path());
+	SetToken("?temp", agi::fs::path(sfs::temp_directory_path()));
 }
 }

libaegisub/unix/path.cpp

@@ -23,20 +23,20 @@
 namespace sfs = std::filesystem;
 
 namespace {
-sfs::path home_dir() {
+agi::fs::path home_dir() {
 	const char *env = getenv("HOME");
-	if (env) return env;
+	if (env) return agi::fs::path(sfs::path(env));
 
 	if ((env = getenv("USER")) || (env = getenv("LOGNAME"))) {
 		if (passwd *user_info = getpwnam(env))
-			return user_info->pw_dir;
+			return agi::fs::path(sfs::path(user_info->pw_dir));
 	}
 
 	throw agi::EnvironmentError("Could not get home directory. Make sure HOME is set.");
 }
 
 #ifdef APPIMAGE_BUILD
-sfs::path data_dir() {
+agi::fs::path data_dir() {
 	char *exe = realpath("/proc/self/exe", NULL);
 	if (!exe) return "";
 
@@ -45,30 +45,29 @@ sfs::path data_dir() {
 
 	if (p.filename() == "bin") {
 		// assume unix prefix layout
-		return p.parent_path()/"share";
+		return agi::fs::path(p.parent_path()/"share");
 	}
 
-	return p;
+	return agi::fs::path(p);
 }
 #endif
 }
 
 namespace agi {
 void Path::FillPlatformSpecificPaths() {
-	sfs::path dotdir = home_dir()/".aegisub";
-	SetToken("?user", dotdir.string());
-	SetToken("?local", dotdir.string());
+	agi::fs::path dotdir = home_dir()/".aegisub";
+	SetToken("?user", dotdir);
+	SetToken("?local", dotdir);
 
 #ifdef APPIMAGE_BUILD
-	sfs::path data = data_dir();
-	if (data == "") data = dotdir.string();
-	SetToken("?data", data.string());
+	agi::fs::path data = data_dir();
+	SetToken("?data", (data == "") ? dotdir : data);
 	SetToken("?dictionary", Decode("?data/dictionaries"));
 #else
 	SetToken("?data", P_DATA);
 	SetToken("?dictionary", "/usr/share/hunspell");
 #endif
 
-	SetToken("?temp", sfs::temp_directory_path().string());
+	SetToken("?temp", agi::fs::path(sfs::temp_directory_path()));
 }
 }