Merge branch 'main' into beta

dacap · Apr 24, 2024 · cf2eb4b · cf2eb4b
2 parents 4b8f3ef + 9769a5b
commit cf2eb4b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/base/fs.h b/base/fs.h
@@ -1,5 +1,5 @@
 // LAF Base Library
-// Copyright (c) 2020-2021 Igara Studio S.A.
+// Copyright (c) 2020-2024 Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -39,6 +39,8 @@ namespace base {
   void remove_directory(const std::string& path);
 
   std::string get_current_path();
+  void set_current_path(const std::string& path);
+
   std::string get_app_path();
   std::string get_temp_path();
   std::string get_user_docs_folder();

diff --git a/base/fs_unix.h b/base/fs_unix.h
@@ -123,11 +123,16 @@ void remove_directory(const std::string& path)
 std::string get_current_path()
 {
   std::vector<char> path(MAXPATHLEN);
-  if (getcwd(&path[0], path.size()))
-    return std::string(&path[0]);
+  if (getcwd(path.data(), path.size()))
+    return std::string(path.data());
   return std::string();
 }
 
+void set_current_path(const std::string& path)
+{
+  chdir(path.data());
+}
+
 std::string get_app_path()
 {
   std::vector<char> path(MAXPATHLEN);
@@ -171,7 +176,7 @@ std::string get_canonical_path(const std::string& path)
   // Ignore return value as realpath() returns nullptr anyway when the
   // resolved_path parameter is specified.
   realpath(path.c_str(), buffer);
-  return path;
+  return buffer;
 }
 
 paths list_files(const std::string& path)

diff --git a/base/fs_win32.h b/base/fs_win32.h
@@ -1,5 +1,5 @@
 // LAF Base Library
-// Copyright (c) 2020 Igara Studio S.A.
+// Copyright (c) 2020-2024 Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -123,6 +123,11 @@ std::string get_current_path()
     return "";
 }
 
+void set_current_path(const std::string& path)
+{
+  ::SetCurrentDirectory(from_utf8(path).c_str());
+}
+
 std::string get_app_path()
 {
   TCHAR buffer[MAX_PATH+1];