X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Fsyscalls.c;h=60b7d952ed53fbae526efe418de13dc321017166;hb=17b6125504e385c169193f3c8e29ced340425979;hp=c649f28f600cc5c2880c7c6a7de75185acb14bb4;hpb=b0da731b2d89b9dd58de2c98eaf6218a41a21920;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/syscalls.c b/AcessNative/ld-acess_src/syscalls.c
index c649f28f..60b7d952 100644
--- a/AcessNative/ld-acess_src/syscalls.c
+++ b/AcessNative/ld-acess_src/syscalls.c
@@ -14,15 +14,9 @@
 #endif
 #include "request.h"
 
-#if SYSCALL_TRACE
-#define DEBUG(str, x...)	Debug(str, x)
-#else
-#define DEBUG(...)	do{}while(0)
-#endif
-
 #define assert(cnd) do{ \
 	if( !(cnd) ) { \
-		fprintf(stderr, "%s:%i - assert failed - " #cnd, __FILE__, __LINE__);\
+		fprintf(stderr, "%s:%i - assert failed - " #cnd"\n", __FILE__, __LINE__);\
 		exit(-1); \
 	} \
 }while(0)
@@ -32,6 +26,7 @@
 // === Types ===
 
 // === IMPORTS ===
+extern int	gbSyscallDebugEnabled;
 
 // === GLOBALS ===
 FILE	*gaSyscall_LocalFPs[MAX_FPS];
@@ -249,7 +244,7 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 		exit(127);
 	}
 	
-	Debug("req->NParams = %i", req->NParams);
+	dataPtr = (void*)&req->Params[req->NParams];
 	assert(req->NParams >= 2);
 	// return
 	assert(req->Params[0].Type == ARG_TYPE_INT64);
@@ -286,7 +281,9 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 	free( req );
 	free( retPtrs );
 	
-	DEBUG(": %i 0x%llx", SyscallID, retValue);
+	if( gbSyscallDebugEnabled ) {
+		SYSTRACE(": %i 0x%llx", SyscallID, retValue);
+	}
 	
 	return retValue;
 }
@@ -345,12 +342,18 @@ int native_execve(const char *filename, const char *const argv[], const char *co
 int native_spawn(const char *filename, const char *const argv[], const char *const envp[])
 {
 	int rv;
-	
+
+	fprintf(stderr, "native_spawn('%s')\n", filename);
+
 	#if __WIN32__
 	rv = _spawnve(_P_NOWAIT, filename, argv, envp);
 	#else
 	rv = posix_spawn(NULL, filename, NULL, NULL, (void*)argv, (void*)envp);
 	#endif
 	
+	if( rv == 0 ) {
+		perror("native_spawn");
+	}
+	
 	return rv;
 }