Changeset 444 for trunk/user/init

Timestamp:

May 16, 2018, 8:31:35 PM (6 years ago)

Author:

satin@…

Message:

add newlib,libalmos-mkh, restructure shared_syscalls.h and mini-libc

Location:

trunk/user/init

Files:

• Makefile (modified) (1 diff)
• init.c (modified) (3 diffs)

trunk/user/init/Makefile

@@ -11 +11 @@
 OBJS = build/init.o
 
-INCLUDES = -I.                     \
-           -I../..                 \
-           -I$(LIBC_INCLUDE)/      \
-           -I$(LIBPTHREAD_INCLUDE)
+INCLUDES = -I.                   \
+           -I../..               \
+           -I$(LIBC_INCLUDE)/    \
+           -I$(LIBPTHREAD_INCLUDE) \
+           -I$(LIBALMOSMKH_INCLUDE) \
+           -I$(SHARED_INCLUDE)
 
 compile : dirs build/init.elf
 build/init.elf : $(OBJS) init.ld
-        $(LD) -o $@ -T init.ld $(OBJS) -nostdlib -L$(LIBC) -L$(LIBPTHREAD) -lc -lpthread
+        $(LD) -o $@ -T init.ld $(OBJS) -nostdlib -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lc -lpthread -lalmos-mkh -lpthread -lc
         $(DU) -D $@ > $@.txt
 

trunk/user/init/init.c

@@ -13 +13 @@
 
 #include <hard_config.h>
-
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <pthread.h>
+#include <almos-mkh.h>
+#include <assert.h>
+#include <sys/wait.h>
 
 #define DEBUG_PROCESS_INIT    0
@@ -54 +57 @@
         {
             // CHILD[i] process exec process KSH[i]
-            ret_exec = exec( "/bin/user/ksh.elf" , NULL , NULL ); 
+            ret_exec = execve( "/bin/user/ksh.elf" , NULL , NULL ); 
 
             if ( ret_exec )   // error in exec              
@@ -139 +142 @@
             {
                 // CHILD process exec process KSH
-                ret_exec = exec( "/bin/user/ksh.elf" , NULL , NULL ); 
+                ret_exec = execve( "/bin/user/ksh.elf" , NULL , NULL ); 
 
                 if ( ret_exec )   // error in exec