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

Timestamp:

Feb 26, 2009, 5:58:49 AM (16 years ago)

Author:

bird

Message:

kash: implementing shfile on top of the win32 api instead of msvcrt.

File:

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

trunk/src/kash/shinstance.c

@@ -80 +80 @@
 
 
-typedef struct shmtxtmp { int i; } shmtxtmp;
-
 int shmtx_init(shmtx *pmtx)
 {
@@ -160 +158 @@
 }
 #endif
+
+/**
+ * Destroys the shell instance.
+ *
+ * This will work on partially initialized instances (because I'm lazy).
+ *
+ * @param   psh     The shell instance to be destroyed.
+ */
+static void sh_destroy(shinstance *psh)
+{
+    memset(psh, 0, sizeof(*psh));
+    free(psh);
+}
 
 /**
@@ -223 +234 @@
     if (psh)
     {
-        if (!sh_env_clone(&psh->shenviron, envp))
+        /* Init it enought for sh_destroy() to not get upset */
+          /* ... */
+
+        /* Call the basic initializers. */
+        if (    !sh_env_clone(&psh->shenviron, envp)
+            &&  !shfile_init(&psh->fdtab, inherit ? &inherit->fdtab : NULL))
         {
             /* the special stuff. */
@@ -282 +298 @@
         }
 
-        free(psh);
+        sh_destroy(psh);
     }
     return NULL;