Refactor getAllEnvVars

Author: lauzadis

runtime/runtime-core/mingw/src/aws/smithy/kotlin/runtime/util/SystemDefaultProviderMingw.kt

@@ -10,11 +10,20 @@ import kotlinx.cinterop.*
 import platform.posix.environ
 import platform.posix.memcpy
 
-internal actual val rawEnvironmentVariables: CPointer<CPointerVarOf<CPointer<ByteVarOf<Byte>>>>? = environ
-
 public actual object SystemDefaultProvider : SystemDefaultProviderBase() {
     actual override val filePathSeparator: String = "\\"
     actual override fun osInfo(): OperatingSystem = OperatingSystem(OsFamily.Windows, osVersionFromKernel())
+
+    actual override fun getAllEnvVars(): Map<String, String> = memScoped {
+        generateSequence(0) { it + 1 }
+            .map { idx -> environ.get(idx)?.toKString() }
+            .takeWhile { it != null }
+            .associate { env ->
+                val parts = env?.split("=", limit = 2)
+                check(parts?.size == 2) { "Environment entry \"$env\" is malformed" }
+                parts[0] to parts[1]
+            }
+    }
 }
 
 // The functions below are adapted from C++ SDK:

runtime/runtime-core/native/src/aws/smithy/kotlin/runtime/util/SystemDefaultProviderBase.kt

@@ -10,20 +10,7 @@ import kotlinx.cinterop.*
 import kotlinx.coroutines.withContext
 import platform.posix.*
 
-internal expect val rawEnvironmentVariables: CPointer<CPointerVarOf<CPointer<ByteVarOf<Byte>>>>?
-
 public abstract class SystemDefaultProviderBase : PlatformProvider {
-    override fun getAllEnvVars(): Map<String, String> = memScoped {
-        generateSequence(0) { it + 1 }
-            .map { idx -> rawEnvironmentVariables?.get(idx)?.toKString() }
-            .takeWhile { it != null }
-            .associate { env ->
-                val parts = env?.split("=", limit = 2)
-                check(parts?.size == 2) { "Environment entry \"$env\" is malformed" }
-                parts[0] to parts[1]
-            }
-    }
-
     override fun getenv(key: String): String? = platform.posix.getenv(key)?.toKString()
 
     override suspend fun readFileOrNull(path: String): ByteArray? = withContext(SdkDispatchers.IO) {

runtime/runtime-core/posix/src/aws/smithy/kotlin/runtime/util/SystemDefaultProviderPosix.kt

@@ -5,12 +5,10 @@
 package aws.smithy.kotlin.runtime.util
 
 import kotlinx.cinterop.*
-import platform.posix.__environ
+import aws.smithy.platform.posix.get_environ_ptr
 import platform.posix.uname
 import platform.posix.utsname
 
-internal actual val rawEnvironmentVariables: CPointer<CPointerVarOf<CPointer<ByteVarOf<Byte>>>>? = __environ
-
 public actual object SystemDefaultProvider : SystemDefaultProviderBase() {
     actual override val filePathSeparator: String = "/"
 
@@ -39,4 +37,16 @@ public actual object SystemDefaultProvider : SystemDefaultProviderBase() {
 
         return OperatingSystem(family, version)
     }
+
+    actual override fun getAllEnvVars(): Map<String, String> = memScoped {
+        val environ = get_environ_ptr()
+        generateSequence(0) { it + 1 }
+            .map { idx -> environ?.get(idx)?.toKString() }
+            .takeWhile { it != null }
+            .associate { env ->
+                val parts = env?.split("=", limit = 2)
+                check(parts?.size == 2) { "Environment entry \"$env\" is malformed" }
+                parts[0] to parts[1]
+            }
+    }
 }