Changeset 444 for trunk/user/ksh

Timestamp:

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

Author:

satin@…

Message:

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

Location:

trunk/user/ksh

Files:

• Makefile (modified) (1 diff)
• ksh.c (modified) (2 diffs)

trunk/user/ksh/Makefile

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

trunk/user/ksh/ksh.c

@@ -10 +10 @@
 #include <stdlib.h>
 #include <string.h>
-#include <shared_syscalls.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <unistd.h>
+#include <almos-mkh.h>
 
 #define CMD_MAX_SIZE   (256)    // max number of characters in one command
@@ -425 +428 @@
     {
         // CHILD process exec NEW process
-        ret_exec = exec( pathname , NULL , NULL );
+        ret_exec = execve( pathname , NULL , NULL );
 
         // this is only executed in case of exec failure