X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=AcessNative%2Flibacess-native.so_src%2Fexports.c;h=ad5aac4911b39a9316d86461efc4ee35ae758627;hb=63895b4261593e7891a28db441a54615d0374c8b;hp=17ee997469e1693a66e190fbd04cde337bdb3c97;hpb=e7a76b0d8a0cc6aa77966509780973a6f8216ef7;p=tpg%2Facess2.git

diff --git a/AcessNative/libacess-native.so_src/exports.c b/AcessNative/libacess-native.so_src/exports.c
index 17ee9974..ad5aac49 100644
--- a/AcessNative/libacess-native.so_src/exports.c
+++ b/AcessNative/libacess-native.so_src/exports.c
@@ -1,3 +1,4 @@
+#include "common.h"
 
 #define acess__SysSpawn	_disabled_acess__SysSpawn
 #include "../ld-acess_src/exports.c"
@@ -9,30 +10,50 @@ int *libc_geterrno(void)
 	return &acess__errno;
 }
 
+void _ZN4_sys5debugEPKcz(const char *fmt, ...)	__attribute__((alias("acess__SysDebug")));
+void _ZN4_sys7hexdumpEPKcPKvj(const char *tag, const void *ptr, size_t size) __attribute__((alias("acess__SysDebugHex")));
+
 #undef acess__SysSpawn
 
 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++] );
+	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,
+	char realpath[256];
+	realpath[255] = 0;
+
+	if( _Syscall(SYS_AN_GETPATH, "<d >s", sizeof(realpath)-1, realpath, binary) <= 0 ) {
+		Warning("No translation for path '%s'", binary);
+		acess__errno = -11;
+		return -1;
+	}
+
+	Warning("TODO: Spawn '%s' = '%s'", binary, realpath);
+
+	 int	emulated_tid;
+	int newID = _Syscall(SYS_AN_SPAWN, "<d >d >d",
+		sizeof(emulated_tid), &emulated_tid,
 		nfd*sizeof(int), fds,
-		info ? sizeof(*info) : 0, info);
-	
+		(info ? sizeof(*info) : 0), info
+		);
 
-	Warning("TODO: Spawn '%s'", binary);
-	// TODO: Translate internal path to actual path	
+	if( newID <= 0 ) {
+		return -1;
+	}
 
-	// TODO: set environment variables for libacess-native
-	// > ACESSNATIVE_KEY=`newID`
-	//native_spawn(binary, argv, envp);
+	if( acessnative_spawn(realpath, newID, argv, envp) ) {
+	}
 
-	return 0;
+	return emulated_tid;
+}
+
+void ldacess_DumpLoadedLibraries(void)
+{
+	Debug("ldacess_DumpLoadedLibraries");
 }