X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fsyscalls.c;h=4416ec4fed0e2f384f2e11f4dabb0c78deb941bf;hb=b60e6b273c3ecb1614d937bf9448033e9d339e83;hp=1f2f798053ef1c365fb122f62c05a43a7efc0c23;hpb=479d0634670b58da044bc58149662adba0ad1d0b;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/syscalls.c b/KernelLand/Kernel/syscalls.c
index 1f2f7980..4416ec4f 100644
--- a/KernelLand/Kernel/syscalls.c
+++ b/KernelLand/Kernel/syscalls.c
@@ -29,8 +29,8 @@
 #define CHECK_STR_ARRAY(arr)	do {\
 	 int	i;\
 	char	**tmp = (char**)arr; \
-	CHECK_NUM_NONULL( tmp, sizeof(char**) ); \
-	for(i=0;tmp[i];i++) { \
+	CHECK_NUM_NULLOK( tmp, sizeof(char**) ); \
+	for(i=0;tmp&&tmp[i];i++) { \
 		CHECK_STR_NONULL( tmp[i] ); \
 		CHECK_NUM_NONULL( &tmp[i+1], sizeof(char*) ); \
 	}\
@@ -172,7 +172,8 @@ void SyscallHandler(tSyscallRegs *Regs)
 		CHECK_STR_NONULL((const char*)Regs->Arg1);
 		CHECK_STR_ARRAY((const char**)Regs->Arg2);
 		CHECK_STR_ARRAY((const char**)Regs->Arg3);
-		CHECK_NUM_NULLOK((void*)Regs->Arg5, Regs->Arg4*sizeof(int));
+		if( Regs->Arg4 > 0 )
+			CHECK_NUM_NONULL((void*)Regs->Arg5, Regs->Arg4*sizeof(int));
 		ret = Proc_SysSpawn(
 			(const char*)Regs->Arg1, (const char**)Regs->Arg2, (const char**)Regs->Arg3,
 			Regs->Arg4, (int*)Regs->Arg5
@@ -213,6 +214,11 @@ void SyscallHandler(tSyscallRegs *Regs)
 		VFS_Close( Regs->Arg1 );
 		break;
 	
+	case SYS_COPYFD:
+		LOG("VFS_DuplicateFD(%i,%i)", Regs->Arg1, Regs->Arg2);
+		ret = VFS_DuplicateFD(Regs->Arg1, Regs->Arg2);
+		break;
+	
 	case SYS_SEEK:
 		#if BITS == 64
 		ret = VFS_Seek( Regs->Arg1, Regs->Arg2, Regs->Arg3 );