Improve previous change.
authorJuan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Sat, 6 Feb 2010 22:57:49 +0000 (23:57 +0100)
committerJuan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Sat, 6 Feb 2010 22:57:49 +0000 (23:57 +0100)
src/c/unixsys.d

index 3846bb3..6aacd8f 100755 (executable)
@@ -85,7 +85,7 @@ from_list_to_execve_argument(cl_object l, char ***environp)
         cl_object p;
         cl_index i, j, total_size = 0, nstrings = 0;
         cl_object buffer;
-        char **env;
+        char **environ;
         for (p = l; !Null(p); p = ECL_CONS_CDR(p)) {
                 cl_object s;
                 if (!CONSP(p)) {
@@ -103,7 +103,7 @@ from_list_to_execve_argument(cl_object l, char ***environp)
         /* Extra place for ending null */
         total_size++;
         buffer = ecl_alloc_simple_base_string(++total_size);
-        env = ecl_alloc_atomic((nstrings + 1) * sizeof(char*));
+        environ = ecl_alloc_atomic((nstrings + 1) * sizeof(char*));
         for (j = i = 0, p = l; !Null(p); p = ECL_CONS_CDR(p)) {
                 cl_object s = ECL_CONS_CAR(p);
                 cl_index l = s->base_string.fillp;
@@ -112,7 +112,7 @@ from_list_to_execve_argument(cl_object l, char ***environp)
                                 " changed during execution.", 0);
                         break;
                 }
-                env[j++] = buffer->base_string.self + i;
+                environ[j++] = buffer->base_string.self + i;
                 memcpy(buffer->base_string.self + i,
                        s->base_string.self,
                        l);
@@ -120,7 +120,7 @@ from_list_to_execve_argument(cl_object l, char ***environp)
                 buffer->base_string.self[i++] = 0;
         }
         buffer->base_string.self[i++] = 0;
-        env[j] = 0;
+        environ[j] = 0;
         if (environp) *environp = environ;
         return buffer;
 }