- use char* get_current_dir_name() in Mac/Linux to save the cwd in th…

…e shell open function
ZDoom · Aug 17, 2022 · e261132 · e261132
1 parent a2369b9
commit e261132
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/src/common/platform/posix/cocoa/i_system.mm b/src/common/platform/posix/cocoa/i_system.mm
@@ -186,18 +186,20 @@ bool I_ChDir(const char* path)
 	return chdir(path) == 0;
 }
 
-void I_OpenShellFolder(const char* folder)
+void I_OpenShellFolder(const char* infolder)
 {
-	char curdir[PATH_MAX];
-	if (!getcwd (curdir, countof(curdir)))
+	char* curdir = get_current_dir_name();
+
+	if (!chdir(infolder))
 	{
-		Printf ("Current path too long\n");
-		return;
+		Printf("Opening folder: %s\n", infolder);
+		system("open .");
+		chdir(curdir);
 	}
-
-	chdir(folder);
-	Printf("Opening folder: %s\n", folder);
-	std::system("open .");
-	chdir(curdir);
+	else
+	{
+		Printf("Unable to open directory '%s\n", infolder);
+	}
+	free(curdir);
 }
 
diff --git a/src/common/platform/posix/sdl/i_system.cpp b/src/common/platform/posix/sdl/i_system.cpp
@@ -447,18 +447,20 @@ unsigned int I_MakeRNGSeed()
 	return seed;
 }
 
-void I_OpenShellFolder(const char* folder)
+void I_OpenShellFolder(const char* infolder)
 {
-	char curdir[PATH_MAX];
-	if (!getcwd (curdir, countof(curdir)))
+	char* curdir = get_current_dir_name();
+
+	if (!chdir(infolder))
 	{
-		Printf ("Current path too long\n");
-		return;
+		Printf("Opening folder: %s\n", infolder);
+		system("xdg-open .");
+		chdir(curdir);
 	}
-
-	chdir(folder);
-	Printf("Opening folder: %s\n", folder);
-	std::system("xdg-open .");
-	chdir(curdir);
+	else
+	{
+		Printf("Unable to open directory '%s\n", infolder);
+	}
+	free(curdir);
 }