Changeset 3451 for trunk/src

Timestamp:

Sep 13, 2020, 1:21:43 PM (5 years ago)

Author:

bird

Message:

kash: forked-mode build fixes.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• shfile.c (modified) (2 diffs)
• shheap.c (modified) (1 diff)
• shinstance.c (modified) (1 diff)
• shinstance.h (modified) (1 diff)

trunk/src/kash/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2005-2010 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+# Copyright (c) 2005-2020 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
 #
 # This file is part of kBuild.

trunk/src/kash/shfile.c

@@ -1114 +1114 @@
             strtinfo->lpReserved2 = pbData;
 
+# ifndef SH_FORKED_MODE
             shmtx_leave(&pfdtab->mtx, &tmp); /* should be harmless as this isn't really necessary at all. */
             shmtx_enter(&g_sh_exec_inherit_mtx, &info->tmp);
             shmtx_enter(&pfdtab->mtx, &tmp);
+# endif
 
             *(int *)pbData = count;
@@ -1194 +1196 @@
                     shfile_set_inherit_win(file, 0);
 
+# ifndef SH_FORKED_MODE
         if (info->inherithandles)
             shmtx_leave(&g_sh_exec_inherit_mtx, &info->tmp);
+# endif
     }
 

trunk/src/kash/shheap.c

@@ -384 +384 @@
 {
 #ifdef SHHEAP_IN_USE
-    shmemhdr *mem = (shmemhdr *)ptr - 1;
+    shmemhdr *mem;
     shmemhdr *right;
     shmemhdr *left;
     shmtxtmp tmp;
+
+    if (ptr)
+        mem = (shmemhdr *)ptr - 1;
+    else
+        return;
 
     if (mem->magic != SHMEMHDR_MAGIC_USED)

trunk/src/kash/shinstance.c

@@ -278 +278 @@
     sh_free_string_vector(psh, &psh->shenviron);
 
+#ifndef SH_FORKED_MODE
     /** @todo children. */
     sh_free(psh, psh->threadarg);
     psh->threadarg = NULL;
+#endif
 
     /* alias.c */

trunk/src/kash/shinstance.h

@@ -60 +60 @@
 #endif
 
+#ifndef SH_FORKED_MODE
 extern shmtx g_sh_exec_inherit_mtx;
+#endif
 
 /**