diff --git a/src/bin/shell/main.c b/src/bin/shell/main.c index 1decfc6..51487e5 100755 --- a/src/bin/shell/main.c +++ b/src/bin/shell/main.c @@ -42,14 +42,6 @@ } buffer[count] = '\0'; } - -int checkPid(int pid) { - asm( - "int %0\n" - : : "i" (0x80),"a" (6),"b" (&pid) - ); - return(pid); - } int main() { unsigned char buffer[256],*tmp; @@ -68,7 +60,7 @@ exec(tmp); } else { - while (checkPid(cPid)); + while (pidStatus(cPid)); } } } diff --git a/src/lib/libc/sys/Makefile b/src/lib/libc/sys/Makefile index 6355524..9225575 100755 --- a/src/lib/libc/sys/Makefile +++ b/src/lib/libc/sys/Makefile @@ -14,7 +14,7 @@ REMOVE = rm -f #Objects -OBJS = exec.o getpid.o fork.o +OBJS = exec.o getpid.o fork.o pidstatus.o #Output OUTPUT = sys.so diff --git a/ubixos.kdevprj b/ubixos.kdevprj index f45c7ff..26b5538 100755 --- a/ubixos.kdevprj +++ b/ubixos.kdevprj @@ -177,7 +177,7 @@ type=static_library [src/lib/libc/include/Makefile.am] -files=src/lib/libc/include/stdarg.h,src/lib/libc/include/stdio.h,src/lib/libc/include/unistd.h,src/lib/libc/include/stdlib.h +files=src/lib/libc/include/stdarg.h,src/lib/libc/include/stdio.h,src/lib/libc/include/unistd.h,src/lib/libc/include/stdlib.h,src/lib/libc/include/string.h sub_dirs=sys type=normal @@ -199,6 +199,12 @@ install_location= type=HEADER +[src/lib/libc/include/string.h] +dist=true +install=false +install_location= +type=HEADER + [src/lib/libc/include/sys/Makefile.am] files=src/lib/libc/include/sys/types.h,src/lib/libc/include/sys/sys.h sub_dirs= @@ -309,7 +315,7 @@ type=DATA [src/lib/libc/sys/Makefile.am] -files=src/lib/libc/sys/getpid.c,src/lib/libc/sys/Makefile,src/lib/libc/sys/exec.c,src/lib/libc/sys/fork.c +files=src/lib/libc/sys/getpid.c,src/lib/libc/sys/Makefile,src/lib/libc/sys/exec.c,src/lib/libc/sys/fork.c,src/lib/libc/sys/pidstatus.c sharedlib_LDFLAGS=-version-info 0:0:1 sharedlib_rootname=sys sub_dirs= @@ -333,6 +339,12 @@ install_location= type=SOURCE +[src/lib/libc/sys/pidstatus.c] +dist=true +install=false +install_location= +type=SOURCE + [src/lib/libc/vsprintf.c] dist=true install=false