X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Fexports.c;h=07662a5bd36d27a50b84cdc0d401ac30d9ca4b10;hb=590ae24e57553f79a92d6ef52c0468c07aa5de22;hp=7e13134bc6dd06f56b194d842fda58e54ada9518;hpb=9d234f984c149fcc6b1f5aab21a0ca227c060e32;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/exports.c b/AcessNative/ld-acess_src/exports.c
index 7e13134b..07662a5b 100644
--- a/AcessNative/ld-acess_src/exports.c
+++ b/AcessNative/ld-acess_src/exports.c
@@ -37,6 +37,7 @@ extern int	AllocateMemory(uintptr_t VirtAddr, size_t ByteCount);
 
 // === GLOBALS ===
 int	acess__errno;
+char	*gsExecutablePath = "./ld-acess";
 
 // === CODE ===
 // --- VFS Calls
@@ -253,6 +254,40 @@ int acess_execve(char *path, char **argv, const char **envp)
 	return native_execve("./ld-acess", new_argv, envp);
 }
 
+int acess__SysSpawn(const char *binary, const char **argv, const char **envp, int nfd, int fds[], struct s_sys_spawninfo *info)
+{
+	 int	argc = 0;
+	while( argv[argc++] );
+
+	Debug("_SysSpawn('%s', %p (%i), %p, %i, %p, %p)",
+		binary, argv, argc, envp, nfd, fds, info);
+
+	 int	kernel_tid;
+	 int	newID;
+	newID = _Syscall(SYS_AN_SPAWN, "<d >d >d", sizeof(int), &kernel_tid,
+		nfd*sizeof(int), fds,
+		info ? sizeof(*info) : 0, info);
+
+	const char	*new_argv[5+argc+1];
+	 int	new_argc = 0, i;
+	char	client_id_str[11];
+	sprintf(client_id_str, "%i", newID);
+	new_argv[new_argc++] = gsExecutablePath;       // TODO: Get path to ld-acess executable
+	new_argv[new_argc++] = "--key";
+	new_argv[new_argc++] = client_id_str;
+	new_argv[new_argc++] = "--binary";
+	new_argv[new_argc++] = binary;
+	for( i = 0; argv[i]; i ++)
+		new_argv[new_argc++] = argv[i];
+	new_argv[new_argc++] = NULL;
+	
+	// TODO: Debug output?
+	
+	native_spawn(gsExecutablePath, new_argv, envp);
+
+	return kernel_tid;
+}
+
 void acess_sleep(void)
 {
 	DEBUG("%s()", __func__);
@@ -339,12 +374,15 @@ const tSym	caBuiltinSymbols[] = {
 	
 	DEFSYM(clone),
 	DEFSYM(execve),
+	DEFSYM(_SysSpawn),
 	DEFSYM(sleep),
 	
 	DEFSYM(waittid),
+	DEFSYM(gettid),
 	DEFSYM(setuid),
 	DEFSYM(setgid),
-	DEFSYM(gettid),
+	DEFSYM(getuid),
+	DEFSYM(getgid),
 
 	DEFSYM(SysSendMessage),
 	DEFSYM(SysGetMessage),