X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Fexports.c;h=947e0d363aea3ebee871479df09dbd6f99021c23;hb=c84c6acf1e8be4fb6e76ef0f8fd275400be8d5ae;hp=533c25b36e4c0964c2df0240f72b156d0b47b4a8;hpb=b4e2712f6a0849de53207ad50a38c9f468f22651;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/exports.c b/AcessNative/ld-acess_src/exports.c
index 533c25b3..947e0d36 100644
--- a/AcessNative/ld-acess_src/exports.c
+++ b/AcessNative/ld-acess_src/exports.c
@@ -93,10 +93,13 @@ int acess_ioctl(int fd, int id, void *data) {
 	return _Syscall(SYS_IOCTL, ">i >i ?d", fd, id, 1024, data);
 }
 int acess_finfo(int fd, t_sysFInfo *info, int maxacls) {
+	DEBUG("offsetof(size, t_sysFInfo) = %i", offsetof(t_sysFInfo, size));
+	DEBUG("finfo(%i, %p, %i)", fd, info, maxacls);
 	return _Syscall(SYS_FINFO, ">i <d >i",
 		fd,
 		sizeof(t_sysFInfo)+maxacls*sizeof(t_sysACL), info,
-		maxacls);
+		maxacls
+		);
 }
 
 int acess_readdir(int fd, char *dest) {
@@ -120,7 +123,7 @@ int acess__SysOpenChild(int fd, char *name, int flags) {
 }
 
 int acess__SysGetACL(int fd, t_sysACL *dest) {
-	return _Syscall(SYS_GETACL, "<i >i <d", fd, sizeof(t_sysACL), dest);
+	return _Syscall(SYS_GETACL, ">i <d", fd, sizeof(t_sysACL), dest);
 }
 
 int acess__SysMount(const char *Device, const char *Directory, const char *Type, const char *Options) {
@@ -129,7 +132,7 @@ int acess__SysMount(const char *Device, const char *Directory, const char *Type,
 
 
 // --- Error Handler
-int	acess__SysSetFaultHandler(int (*Handler)(int)) {
+int acess__SysSetFaultHandler(int (*Handler)(int)) {
 	printf("TODO: Set fault handler (asked to set to %p)\n", Handler);
 	return 0;
 }
@@ -197,10 +200,17 @@ int acess_execve(char *path, char **argv, char **envp)
 	for( i = 0; i < argc; i ++ )
 		printf("\"%s\" ", new_argv[i]);
 	printf("\n");
+	if(envp)
+	{
+		printf("envp = %p\n", envp);
+		for( i = 0; envp[i]; i ++ )
+			printf("%i: \"%s\"\n", i, envp[i]);
+		printf("envc = %i\n", i);
+	}
 	#endif
 	
 	// Call actual execve
-	return execve("./ld-acess", new_argv, envp);
+	return native_execve("./ld-acess", new_argv, envp);
 }
 
 void acess_sleep(void)