From 239ecb6b5a452280c0469886233324338c897b3d Mon Sep 17 00:00:00 2001
From: Michael Carroll <mjcarroll@intrinsic.ai>
Date: Wed, 1 Nov 2023 16:50:50 +0000
Subject: [PATCH] Back to original implementation

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
---
 src/Environment.cc | 49 +++++++---------------------------------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/src/Environment.cc b/src/Environment.cc
index ba4a239..d1e5c27 100644
--- a/src/Environment.cc
+++ b/src/Environment.cc
@@ -22,14 +22,7 @@
 #include <string>
 #include <vector>
 
-#ifdef _WIN32
-#include <winbase.h>
-#include <windows.h>
-#endif
-
-#ifndef _WIN32
 extern char ** environ;
-#endif
 
 namespace gz
 {
@@ -134,47 +127,20 @@ bool clearenv()
 /////////////////////////////////////////////////
 EnvironmentMap env()
 {
-  EnvironmentMap ret;
+  // Portable method for reading environment variables
+  // Ref: https://stackoverflow.com/a/71483564/460065
+  char **currentEnv {nullptr};
 #ifdef _WIN32
-  DWORD environment_block_size = GetEnvironmentBlockSize();
-
-  // Allocate a buffer to store the environment block.
-  LPCH env_buf = (LPCH)malloc(environment_block_size);
-  if (env_buf == nullptr) {
-    return {};
-  }
-  // Get the environment block.
-  if (!GetEnvironmentVariables(env_buf, environment_block_size)) {
-    free(env_buf);
-    return {};
-  }
-  // Parse the environment block into an unordered_map.
-  LPCH env_var = env_buf;
-  while (*env_var != '\0') {
-    // Split the environment variable into a key-value pair.
-    char* equal_sign = strchr(env_var, '=');
-    if (equal_sign == nullptr) {
-      continue;
-    }
-
-    // Get the key and value of the environment variable.
-    std::string key(env_var, equal_sign - env_var);
-    std::string value(equal_sign + 1);
-
-    // Add the key-value pair to the unordered_map.
-    ret[key] = value;
-
-    // Advance to the next environment variable.
-    env_var = equal_sign + 1;
-  }
-  free(env_buf);
+  currentEnv =  *__p_environ();
 #else
-  char **currentEnv = environ;
+  currentEnv = environ;
+#endif
   // In the case that clearenv() was just called
   // currentEnv will be nullptr
   if (currentEnv == nullptr)
     return {};
 
+  EnvironmentMap ret;
   for (; *currentEnv; ++currentEnv)
   {
     std::string var(*currentEnv);
@@ -182,7 +148,6 @@ EnvironmentMap env()
     var.erase(0, var.find('=') + 1);
     ret[key] = var;
   }
-#endif
   return ret;
 }