Changeset 2294 for trunk/src/kash/shinstance.c

Timestamp:

Feb 28, 2009, 9:33:26 AM (16 years ago)

Author:

bird

Message:

kash: more fixes + pipe.

File:

• trunk/src/kash/shinstance.c (modified) (6 diffs)

trunk/src/kash/shinstance.c

@@ -181 +181 @@
 
 /**
- * Clones an environment vector.
+ * Clones a string vector like enviorn or argv.
  *
  * @returns 0 on success, -1 and errno on failure.
+ * @param   psh     The shell to associate the allocations with.
  * @param   dstp    Where to store the clone.
  * @param   src     The vector to be cloned.
  */
-static int sh_env_clone(char ***dstp, char **src)
+static int sh_clone_string_vector(shinstance *psh, char ***dstp, char **src)
 {
    char **dst;
@@ -198 +199 @@
 
    /* alloc clone array. */
-   *dstp = dst = sh_malloc(NULL, sizeof(*dst) * items + 1);
+   *dstp = dst = sh_malloc(psh, sizeof(*dst) * items + 1);
    if (!dst)
        return -1;
@@ -206 +207 @@
    while (items-- > 0)
    {
-       dst[items] = sh_strdup(NULL, src[items]);
+       dst[items] = sh_strdup(psh, src[items]);
        if (!dst[items])
        {
            /* allocation error, clean up. */
            while (dst[++items])
-               sh_free(NULL, dst[items]);
-           sh_free(NULL, dst);
+               sh_free(psh, dst[items]);
+           sh_free(psh, dst);
            errno = ENOMEM;
            return -1;
@@ -246 +247 @@
 
         /* Call the basic initializers. */
-        if (    !sh_env_clone(&psh->shenviron, envp)
+        if (    !sh_clone_string_vector(psh, &psh->shenviron, envp)
+            &&  !sh_clone_string_vector(psh, &psh->argptr, argv)
             &&  !shfile_init(&psh->fdtab, inherit ? &inherit->fdtab : NULL))
         {
@@ -916 +918 @@
 #elif K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
     pid = shfork_do_it(psh);
+# ifdef DEBUG
+    if (!pid)
+        opentrace(psh);
+# endif
 
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
@@ -928 +934 @@
 
 #endif
+
+    /* child: update the pid */
+    if (!pid)
+# ifdef _MSC_VER
+        psh->pid = _getpid();
+# else
+        psh->pid = getpid();
+# endif
 
     TRACE2((psh, "sh_fork -> %d [%d]\n", pid, errno));