Attempt at corretly passing the env variables on windows.

Author: pmurias

src/vm/parrot/ops/nqp.ops

@@ -336,7 +336,27 @@ extern char **environ;
 #ifdef WIN32
 #include <windows.h>
 #include <process.h>
-static INTVAL Run_OS_Command(PARROT_INTERP, STRING *command, char **env)
+static char * pack_env_hash(Parrot_Interp interp, PMC* hash_pmc) {
+    Hash *hash = VTABLE_get_pointer(interp, hash_pmc);
+    STRING *equal = Parrot_str_new_constant(interp, "=");
+    STRING *key, *value, *env_var, *env_var_with_null;
+    INTVAL hash_size = Parrot_hash_size(interp, hash);
+    STRING *packed = Parrot_str_new_constant(interp, "");
+    STRING *null = Parrot_str_new_constant(interp, "\n");
+
+    
+    /* Parrot_hash_value_to_string is not exported*/
+    parrot_hash_iterate(hash,
+        key = (STRING *)_bucket->key;
+        value = VTABLE_get_string_keyed_str(interp, hash_pmc, key);
+        env_var = Parrot_str_concat(interp, key, Parrot_str_concat(interp, equal, value));
+        env_var_with_null = Parrot_str_concat(interp, env_var, null);
+        packed = Parrot_str_concat(interp, packed, env_var_with_null);
+    );
+    return Parrot_str_to_cstring(interp, packed);
+}
+
+static INTVAL Run_OS_Command(PARROT_INTERP, STRING *command, PMC *env_hash)
 {
     DWORD status = 0;
     STARTUPINFO si;
@@ -345,6 +365,7 @@ static INTVAL Run_OS_Command(PARROT_INTERP, STRING *command, char **env)
     char* const cmd       = (char *)mem_sys_allocate(command->strlen + 4);
     char* const shell     = Parrot_str_to_cstring(interp, Parrot_getenv(interp, comspec));
     char* const cmdin     = Parrot_str_to_cstring(interp, command);
+    char* const env = pack_env_hash(interp, env_hash);
 
     strcpy(cmd, "/c ");
     strcat(cmd, cmdin);
@@ -377,7 +398,36 @@ static INTVAL Run_OS_Command(PARROT_INTERP, STRING *command, char **env)
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-static INTVAL Run_OS_Command(PARROT_INTERP, STRING *command, char **env)
+
+static char ** pack_env_hash(Parrot_Interp interp, PMC* hash_pmc) {
+    Hash *hash = VTABLE_get_pointer(interp, hash_pmc);
+    STRING *equal = Parrot_str_new_constant(interp, "=");
+    STRING *key, *value, *env_var;
+    INTVAL hash_size = Parrot_hash_size(interp, hash);
+    char** packed = mem_sys_allocate_zeroed(sizeof(char*) * (hash_size+1));
+    INTVAL i = 0;
+
+    
+    /* Parrot_hash_value_to_string is not exported*/
+    parrot_hash_iterate(hash,
+        key = (STRING *)_bucket->key;
+        value = VTABLE_get_string_keyed_str(interp, hash_pmc,key);
+        env_var = Parrot_str_concat(interp, key, Parrot_str_concat(interp,equal,value));
+        packed[i++] = Parrot_str_to_cstring(interp, env_var);
+    );
+    packed[hash_size] = NULL;
+    return packed;
+}
+
+static void free_packed_env(char **env) {
+    INTVAL i = 0;
+    while (env[i]) {
+        Parrot_str_free_cstring(env[i]);
+        i++;
+    }
+    mem_sys_free(env);
+}
+static INTVAL Run_OS_Command(PARROT_INTERP, STRING *command, PMC *env_hash)
 {
     pid_t child;
     child = fork();
@@ -396,9 +446,11 @@ static INTVAL Run_OS_Command(PARROT_INTERP, STRING *command, char **env)
     else {
         /* child */
         char * const cmd    = Parrot_str_to_cstring(interp, command);
+        char **env = pack_env_hash(interp,env_hash);
         const int    status = execle("/bin/sh", "sh", "-c", cmd, (void *)NULL, env); 
         /* if we get here, something's horribly wrong, but free anyway... */
         Parrot_str_free_cstring(cmd);
+        free_packed_env(env);
 
         if (status)
             PARROT_FORCE_EXIT(status);
@@ -415,34 +467,6 @@ static INTVAL Run_OS_Command(PARROT_INTERP, STRING *command, char **env)
     printf("env_var: %s\n", Parrot_str_to_cstring(interp,env_var));
 */
 
-static char ** pack_env_hash(Parrot_Interp interp, PMC* hash_pmc) {
-    Hash *hash = VTABLE_get_pointer(interp,hash_pmc);
-    STRING *equal = Parrot_str_new_constant(interp,"=");
-    STRING *key, *value, *env_var;
-    INTVAL hash_size = Parrot_hash_size(interp,hash);
-    char** packed = mem_sys_allocate_zeroed(sizeof(char*) * (hash_size+1));
-    INTVAL i = 0;
-
-    
-    /* Parrot_hash_value_to_string is not exported*/
-    parrot_hash_iterate(hash,
-        key = (STRING *)_bucket->key;
-        value = VTABLE_get_string_keyed_str(interp,hash_pmc,key);
-        env_var = Parrot_str_concat(interp,key,Parrot_str_concat(interp,equal,value));
-        packed[i++] = Parrot_str_to_cstring(interp,env_var);
-    );
-    packed[hash_size] = NULL;
-    return packed;
-}
-
-static void free_packed_env(char **env) {
-    INTVAL i = 0;
-    while (env[i]) {
-        Parrot_str_free_cstring(env[i]);
-        i++;
-    }
-    mem_sys_free(env);
-}
 
 END_OPS_PREAMBLE
 
@@ -3492,15 +3516,13 @@ inline op nqp_getlexrelcaller(out PMC, in PMC, in STR) :base_core {
 inline op nqp_shell(out INT, in STR, in STR, in PMC) {
      STRING *command = $2;  
      STRING *dir = $3;  
+     PMC *env = $4;
 
      STRING * const old_cwd = Parrot_file_getcwd(interp);
-     char **env = pack_env_hash(interp,$4);
 
      Parrot_file_chdir(interp, dir);
      $1 = Run_OS_Command(interp, command, env);
      Parrot_file_chdir(interp, old_cwd);
-
-     free_packed_env(env);
 }
 
 inline op nqp_getenvhash(out PMC) {