X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Fsyscalls.c;h=26f6c44c88737b86543cb727c0014500f81b3c40;hb=a01b96ccf4ec884e5b894d08a819a37ea3f5f749;hp=91b8de6211625887e426b1ea991f372454fe51d3;hpb=57e4db716b3e7db0be336abd9f256962e3b19aa3;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/syscalls.c b/AcessNative/ld-acess_src/syscalls.c
index 91b8de62..26f6c44c 100644
--- a/AcessNative/ld-acess_src/syscalls.c
+++ b/AcessNative/ld-acess_src/syscalls.c
@@ -9,9 +9,14 @@
 #include <string.h>
 #include <stddef.h>
 #include <unistd.h>
+#include <spawn.h>	// posix_spawn
 #include "request.h"
 
+#if SYSCALL_TRACE
 #define DEBUG(str, x...)	Debug(str, x)
+#else
+#define DEBUG(...)	do{}while(0)
+#endif
 
 #define	MAX_FPS	16
 
@@ -206,6 +211,7 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 	req->ClientID = 0;	//< Filled later
 	req->CallID = SyscallID;
 	req->NParams = paramCount;
+	req->MessageLength = dataLength;
 	dataPtr = &req->Params[paramCount];
 	
 	// Fill `output` and `input`
@@ -253,6 +259,11 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 	}
 	
 	// Write changes to buffers
+	if( req->NParams - 1 != retCount ) {
+		fprintf(stderr, "syscalls.c: Return count inbalance (%i - 1 != exp %i) [Call %i]\n",
+			req->NParams, retCount, SyscallID);
+		exit(127);
+	}
 	retCount = 0;
 	for( i = 1; i < req->NParams; i ++ )
 	{
@@ -318,10 +329,19 @@ uint64_t native_tell(int FD)
 	return ftell( gaSyscall_LocalFPs[FD] );
 }
 
-int native_execve(const char *filename, char *const argv[], char *const envp[])
+int native_execve(const char *filename, const char *const argv[], const char *const envp[])
 {
 	int ret;
-	ret = execve(filename, argv, envp);
+	ret = execve(filename, (void*)argv, (void*)envp);
 	perror("native_execve");
 	return ret;
 }
+
+int native_spawn(const char *filename, const char *const argv[], const char *const envp[])
+{
+	int rv;
+	
+	rv = posix_spawn(NULL, filename, NULL, NULL, (void*)argv, (void*)envp);
+	
+	return rv;
+}