Changeset 2416 for trunk/src/kash/shfork-win.c

Timestamp:

Sep 14, 2010, 2:30:30 AM (15 years ago)

Author:

bird

Message:

kash: implemented opendir/readdir/closedir for windows (NT). Fixed windows forking.

File:

• trunk/src/kash/shfork-win.c (modified) (8 diffs)

trunk/src/kash/shfork-win.c

@@ -6 +6 @@
 #include <string.h>
 #include <locale.h>
+#include <assert.h>
 #include "shinstance.h"
 #include <Windows.h>
@@ -29 +30 @@
 
 /* in shforkA-win.asm: */
+extern pid_t shfork_do_it(shinstance *psh);
 extern void shfork_resume(void *cur, void *base, void *limit);
 
@@ -34 +36 @@
 void *shfork_maybe_forked(int argc, char **argv, char **envp);
 extern int shfork_body(shinstance *psh, void *stack_ptr);
-
-
-/***
+extern void init_syntax(void);
+
+
+/**
  * Called by shforkA-win.asm to check whether we're a forked child
  * process or not.
@@ -64 +67 @@
     {
         char *stack;
-        shheap_init();
-        stack = (char *)sh_malloc(NULL, SHFORK_STACK_SIZE) + SHFORK_STACK_SIZE;
-        g_stack_base = stack + SHFORK_STACK_SIZE;
-        g_stack_limit = stack;
+        shheap_init(NULL);
+        g_stack_limit = stack = (char *)sh_malloc(NULL, SHFORK_STACK_SIZE);
+        g_stack_base = stack += SHFORK_STACK_SIZE;
         return stack;
     }
@@ -83 +85 @@
     g_stack_base  = shfork_string_to_ptr(argv[5], argv[0], "--stack-base");
     g_stack_limit = shfork_string_to_ptr(argv[7], argv[0], "--stack-limit");
+    assert((uintptr_t)stack_ptr < (uintptr_t)g_stack_base);
+    assert((uintptr_t)stack_ptr > (uintptr_t)g_stack_limit);
 
     /*
@@ -137 +141 @@
 }
 
-/***
+/**
+ * Do the fork.
+ * @returns same as fork().
+ * @param   psh             The shell that's forking.
+ */
+int shfork_do(shinstance *psh)
+{
+    /* save globals */
+    void *pheap_head = shheap_get_head();
+    pid_t pid = shfork_do_it(psh);
+    if (pid == 0)
+    {
+        /* reinit stuff, only the heap is copied! */
+        shthread_set_shell(psh);
+        shheap_init(pheap_head);
+        setlocale(LC_ALL, "");
+        init_syntax();
+    }
+    return pid;
+}
+
+/**
  * Create the child process making sure it inherits all our handles,
  * copy of the forkable heap and kick it off.
@@ -156 +181 @@
     DWORD cch;
     int rc = 0;
+
+    assert((uintptr_t)stack_ptr < (uintptr_t)g_stack_base);
+    assert((uintptr_t)stack_ptr > (uintptr_t)g_stack_limit);
 
     /*
@@ -178 +206 @@
                        stack_ptr, g_stack_base, g_stack_limit);
         szCmdLine[cch+1] = '\0';
+        TRACE2((NULL, "shfork_body: szCmdLine=%s\n", szCmdLine));
 
         memset(&StrtInfo, '\0', sizeof(StrtInfo)); /* just in case. */