Changeset 2292 in kBuild

Timestamp:

Feb 28, 2009 4:46:25 AM (16 years ago)

Author:

bird

Message:

kash: forking on widnows.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (3 diffs)
• main.c (modified) (1 diff)
• shfork-win.c (added)
• shforkA-win.asm (added)
• shheap.c (modified) (1 diff)
• shheap.h (modified) (2 diffs)
• shinstance.c (modified) (2 diffs)

trunk/src/kash/Makefile.kmk

@@ -32 +32 @@
 PROGRAMS += kash
 kash_TEMPLATE = BIN
+kash_ASTOOL = YASM
 kash_DEFS = lint SHELL SMALL
 kash_DEFS += SH_STUB_MODE # for the time being.
@@ -50 +51 @@
         HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
 kash_INCS = $(PATH_kash) . # (the last is because of error.h)
+kash_ASFLAGS.win = -g cv8
+kash_ASFLAGS.win.x86   = -f win32
+kash_ASFLAGS.win.amd64 = -f win64
 if "$(USER)" == "bird" && "$(KBUILD_TARGET)" != "win"
 kash_CFLAGS += -std=gnu99
@@ -96 +100 @@
 kash_SOURCES.win = \
         sys_signame.c \
-        strlcpy.c
+        strlcpy.c \
+        shfork-win.c \
+        shforkA-win.asm
 kash_SOURCES.solaris = \
         sys_signame.c \

trunk/src/kash/main.c

@@ -101 +101 @@
 
 int
+#if K_OS == K_OS_WINDOWS
+real_main(int argc, char **argv, char **envp)
+#else
 main(int argc, char **argv, char **envp)
+#endif
 {
         shinstance *psh;

trunk/src/kash/shheap.c

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#include "shheap.h"
 #include <string.h>
 #include <stdlib.h>

trunk/src/kash/shheap.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * The shell heap methods.
+ * The shell memory heap methods.
  */
 
@@ -32 +32 @@
 
 /* heap */
+int shheap_init(void);
 void *sh_malloc(shinstance *, size_t);
 void *sh_calloc(shinstance *, size_t, size_t);

trunk/src/kash/shinstance.c

@@ -39 +39 @@
 #endif
 #include "shinstance.h"
+
+#if K_OS == K_OS_WINDOWS
+extern pid_t shfork_do_it(void); /* shforkA-win.asm */
+#endif
 
 
@@ -872 +876 @@
     pid = -1;
 
-#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
-# ifdef _MSC_VER
-#  ifdef SH_FORKED_MODE
-    /** @todo */
-    *(char *)1 = 0x1;
-#  else
+#elif K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
+    pid = shfork_do_it();
+
+#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
+# ifdef _MSC_VER
     pid = -1;
     errno = ENOSYS;
-#  endif
 # else
     pid = fork();