AcessNative - Added heap shim to libacess-native, disabled spawn

diff --git a/AcessNative/libacess-native.so_src/Makefile b/AcessNative/libacess-native.so_src/Makefile
index 0a074a6..d67f319 100644 (file)
--- a/AcessNative/libacess-native.so_src/Makefile
+++ b/AcessNative/libacess-native.so_src/Makefile
@@ -5,7 +5,7 @@ ifeq ($(PLATFORM),)
        PLATFORM := lin
 endif
 
-OBJ := main.o syscalls.o request.o memory.o exports.o
+OBJ := main.o syscalls.o request.o memory.o exports.o heap.o
 OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
 
 ifeq ($(PLATFORM),win)

diff --git a/AcessNative/libacess-native.so_src/exports.c b/AcessNative/libacess-native.so_src/exports.c
index f22fe46..17ee997 100644 (file)
--- a/AcessNative/libacess-native.so_src/exports.c
+++ b/AcessNative/libacess-native.so_src/exports.c
@@ -26,11 +26,12 @@ int acess__SysSpawn(const char *binary, const char **argv, const char **envp, in
                info ? sizeof(*info) : 0, info);
        
 
+       Warning("TODO: Spawn '%s'", binary);
        // TODO: Translate internal path to actual path 
 
        // TODO: set environment variables for libacess-native
        // > ACESSNATIVE_KEY=`newID`
-       native_spawn(binary, argv, envp);
+       //native_spawn(binary, argv, envp);
 
        return 0;
 }

diff --git a/AcessNative/libacess-native.so_src/heap.c b/AcessNative/libacess-native.so_src/heap.c
new file mode 100644 (file)
index 0000000..7e340f5
--- /dev/null
+++ b/AcessNative/libacess-native.so_src/heap.c
@@ -0,0 +1,29 @@
+/*
+ * AcessNative libacess-native
+ * - By John Hodge (thePowersGang)
+ *
+ * heap.c
+ * - Proxies for the C standard heap
+ */
+#include <stdlib.h>
+
+void *acess_malloc(size_t bytes)
+{
+       return malloc(bytes);
+}
+
+void acess_free(void *ptr)
+{
+       free(ptr);
+}
+
+void *acess_calloc(size_t __nmemb, size_t __size)
+{
+       return calloc(__nmemb, __size);
+}
+
+void *acess_realloc(void *__ptr, size_t __size)
+{
+       return realloc(__ptr, __size);
+}
+