Changeset 3480 in kBuild

Timestamp:

Sep 21, 2020 11:20:56 AM (4 years ago)

Author:

bird

Message:

kash: build fixes (darwin).

Location:

trunk/src/kash

Files:

• exec.c (modified) (4 diffs)
• jobs.c (modified) (3 diffs)
• memalloc.c (modified) (2 diffs)
• mkinit.sh (modified) (1 diff)
• redir.c (modified) (1 diff)
• shinstance.c (modified) (2 diffs)
• shinstance.h (modified) (1 diff)

trunk/src/kash/exec.c

@@ -168 +168 @@
  * Check if 'path' is an absolute (starts with root) path or not.
  */
-K_INLINE isabspath(const char *path)
+K_INLINE int isabspath(const char *path)
 {
 #if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
@@ -187 +187 @@
  * Checks if the filename include a path or not.
  */
-K_INLINE haspath(const char *name)
+K_INLINE int haspath(const char *name)
 {
 #if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
@@ -659 +659 @@
         int idx;
         int prev;
-        int norehashoncd = 1;
         char *fullname;
         int e;
@@ -847 +846 @@
                 cmdp->cmdtype = CMDNORMAL;
                 cmdp->param.n.index = idx;
+#ifdef PC_EXE_EXTS
                 cmdp->param.n.suffix = suffix;
+#else
+                cmdp->param.n.suffix = 0;
+#endif
                 INTON;
                 goto success;

trunk/src/kash/jobs.c

@@ -756 +756 @@
                         }
                         jp = psh->jobtab + psh->njobs;
-                        for (i = 4 ; --i >= 0 ; psh->jobtab[psh->njobs++].used = 0);
+                        for (i = 4 ; --i >= 0 ; psh->jobtab[psh->njobs++].used = 0) { /*empty*/ }
                         INTON;
                         break;
@@ -887 +887 @@
 #endif
 
-static shpid
+STATIC shpid
 forkparent(shinstance *psh, struct job *jp, union node *n, int mode, shpid pid)
 {
@@ -914 +914 @@
 }
 
-static void
+STATIC void
 forkchild(shinstance *psh, shpid pgrp, union node *n, int mode)
 {

trunk/src/kash/memalloc.c

@@ -334 +334 @@
         /*kHlpAssert(end[-1] == '\0'); - not if it's followed by ungrabstrackstr(), sigh. */
         kHlpAssert(SHELL_ALIGN((uintptr_t)pstart) == (uintptr_t)pstart);
-        kHlpAssert(stackblocksize(psh) - psh->sstrnleft >= nbytes);
+        kHlpAssert(stackblocksize(psh) - psh->sstrnleft >= (ssize_t)nbytes);
 
         nbytes = SHELL_ALIGN(nbytes);
@@ -589 +589 @@
 }
 
-#endif KASH_SEPARATE_PARSER_ALLOCATOR
+#endif /* KASH_SEPARATE_PARSER_ALLOCATOR */
 
 

trunk/src/kash/mkinit.sh

@@ -154 +154 @@
 done
 echo "#include \"shinstance.h\""
+echo "#include \"nodes.h\""
 
 echo

trunk/src/kash/redir.c

@@ -68 +68 @@
 #define PIPESIZE SHFILE_PIPE_SIZE
 
-
-MKINIT
 
 //MKINIT struct redirtab *redirlist;

trunk/src/kash/shinstance.c

@@ -626 +626 @@
 #else
             psh->pid = getpid();
-            psh->pgid = getpgid();
+            psh->pgid = getpgid(0);
 #endif
 
@@ -2241 +2241 @@
     if (pid == 0 || psh->pid == pid)
     {
-        shpid pgid = psh->pgid;
+        pgid = psh->pgid;
 #ifndef _MSC_VER
         kHlpAssert(pgid == getpgrp());

trunk/src/kash/shinstance.h

@@ -79 +79 @@
     struct shsubshellstatus *next;      /**< Next free one on the free chain. */
 } shsubshellstatus;
+#else
+struct shsubshellstatus;
 #endif