From ee920a45fddb9bee20337ac57805ac630cf0cd08 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sun, 25 Feb 2024 22:09:04 +1300
Subject: [PATCH] feat(pty): parse env so it can be used with fork

Adds method to convert env from a Dictionary to a PackedStringArray so
it can be used with fork(). Consider making env a PackedStringArray to
begin with.
---
 addons/godot_xterm/native/src/pty.cpp | 14 +++++++++++++-
 addons/godot_xterm/native/src/pty.h   |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/godot_xterm/native/src/pty.cpp b/addons/godot_xterm/native/src/pty.cpp
index 53b455f..da5b405 100644
--- a/addons/godot_xterm/native/src/pty.cpp
+++ b/addons/godot_xterm/native/src/pty.cpp
@@ -111,7 +111,7 @@ Error PTY::fork(const String &file, const PackedStringArray &args, const String
 
     #if defined(__linux__) || defined(__APPLE__)
     String helper_path = ProjectSettings::get_singleton()->globalize_path("res://addons/godot_xterm/native/bin/spawn-helper");
-    result = PTYUnix::fork(fork_file, args, PackedStringArray(), cwd, cols, rows, -1, -1, true, helper_path, Callable(this, "_on_exit"));
+    result = PTYUnix::fork(fork_file, args, _parse_env(fork_env), cwd, cols, rows, -1, -1, true, helper_path, Callable(this, "_on_exit"));
     #endif
 
     Error err = static_cast<Error>((int)result["error"]);
@@ -278,6 +278,18 @@ Dictionary PTY::_get_fork_env() const {
     return os_env;
 }
 
+PackedStringArray PTY::_parse_env(const Dictionary &env) const {
+    PackedStringArray parsed_env;
+    PackedStringArray keys = PackedStringArray(env.keys());
+
+    for (int i = 0; i < keys.size(); i++) {
+        String key = keys[i];
+        parsed_env.push_back(key + "=" + String(env[key]));
+    }
+
+    return parsed_env;
+}
+
 void PTY::_on_exit(int exit_code, int exit_signal) {
     emit_signal(StringName("exited"), exit_code, exit_signal);
 }
diff --git a/addons/godot_xterm/native/src/pty.h b/addons/godot_xterm/native/src/pty.h
index 5a2dbbd..a3744ee 100644
--- a/addons/godot_xterm/native/src/pty.h
+++ b/addons/godot_xterm/native/src/pty.h
@@ -82,6 +82,7 @@ namespace godot
 
     String _get_fork_file(const String &file) const;
     Dictionary _get_fork_env() const;
+    PackedStringArray _parse_env(const Dictionary &env) const;
     void _on_exit(int exit_code, int exit_signal);
     void _close();