From 5da15de17469047d313cd574aaa4bc226bd4cae2 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <github@matthiasm.com>
Date: Sat, 26 Aug 2023 17:27:29 +0200
Subject: [PATCH] FLUID: simplified worker handling

---
 FL/filename.H             |  1 +
 fluid/fluid.cxx           | 24 +++++++++---------------
 src/filename_absolute.cxx | 10 ++++++++++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/FL/filename.H b/FL/filename.H
index fb2272b43..3d9da0294 100644
--- a/FL/filename.H
+++ b/FL/filename.H
@@ -64,6 +64,7 @@ FL_EXPORT Fl_String fl_filename_setext(const Fl_String &filename, const Fl_Strin
 FL_EXPORT Fl_String fl_filename_expand(const Fl_String &from);
 FL_EXPORT Fl_String fl_filename_absolute(const Fl_String &from);
 FL_EXPORT Fl_String fl_filename_relative(const Fl_String &from);
+FL_EXPORT Fl_String fl_getcwd();
 
 #  endif
 
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 9871b3f9c..21ce8093a 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -148,7 +148,7 @@ int modflag_c = 0;
 
 /// Application work directory, stored here when temporarily changing to the source code directory.
 /// \see goto_source_dir()
-static char* app_work_dir = NULL;
+static Fl_String app_work_dir;
 
 /// Used as a counter to set the .fl project dir as the current directory.
 /// \see enter_project_dir(), leave_project_dir()
@@ -368,22 +368,16 @@ void enter_project_dir() {
     fprintf(stderr, "** Fluid internal error: enter_project_dir() no filename set\n");
     return;
   }
-  // get the absolute path to the current project
-  char project_path[FL_PATH_MAX]; project_path[0] = 0;
-  fl_filename_absolute(project_path, FL_PATH_MAX, filename);
-  // cut the name part and leave only the path to our project
-  char *p = (char*)fl_filename_name(project_path);
-  if (p) *p = 0;
   // store the current working directory for later
-  if (!app_work_dir) app_work_dir = (char*)malloc(FL_PATH_MAX);
-  fl_getcwd(app_work_dir, FL_PATH_MAX);
-  // now set the current directory to the path of our .fl file
-  if (fl_chdir(project_path)==-1) {
+  app_work_dir = fl_getcwd();
+  // set the current directory to the path of our .fl file
+  Fl_String project_path = fl_filename_path(fl_filename_absolute(Fl_String(filename)));
+  if (fl_chdir(project_path.c_str()) == -1) {
     fprintf(stderr, "** Fluid internal error: enter_project_dir() can't chdir to %s: %s\n",
-            project_path, strerror(errno));
+            project_path.c_str(), strerror(errno));
     return;
   }
-  // fprintf(stderr, "chdir to %s\n", fl_getcwd(0, FL_PATH_MAX));
+  //fprintf(stderr, "chdir from %s to %s\n", app_work_dir.c_str(), fl_getcwd().c_str());
 }
 
 /**
@@ -399,9 +393,9 @@ void leave_project_dir() {
   // still nested, stay in the project directory
   if (in_project_dir > 0) return;
   // no longer nested, return to the original, usually the application working directory
-  if (fl_chdir(app_work_dir) < 0) {
+  if (fl_chdir(app_work_dir.c_str()) < 0) {
     fprintf(stderr, "** Fluid internal error: leave_project_dir() can't chdir back to %s : %s\n",
-            app_work_dir, strerror(errno));
+            app_work_dir.c_str(), strerror(errno));
   }
 }
 
diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx
index bcf02d93f..8d016c991 100644
--- a/src/filename_absolute.cxx
+++ b/src/filename_absolute.cxx
@@ -325,3 +325,13 @@ Fl_String fl_filename_relative(const Fl_String &from) {
   fl_filename_relative(buffer, FL_PATH_MAX, from.c_str());
   return Fl_String(buffer);
 }
+
+/** Cross-platform function to get the current working directory
+ as a UTF-8 encoded value in an Fl_String.
+ \return the CWD encoded as UTF-8
+ */
+Fl_String fl_getcwd() {
+  char buffer[FL_PATH_MAX];
+  fl_getcwd(buffer, FL_PATH_MAX);
+  return Fl_String(buffer);
+}