X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstub.c;h=a1c67ffb26ab48447e24465a70cb4199981d23f4;hb=eff15be7c050cd7c614b52b997161558bfbc7ab9;hp=2494fc2800b148373d4adb2853d4fddd02d5cb8d;hpb=c1f0f7a89e019bfb3c0dc908820118e10b83790b;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index 2494fc28..a1c67ffb 100644
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -4,7 +4,8 @@
 #include "stdio_int.h"
 #include "lib.h"
 #include <stdio.h>
-#include <sys/sys.h>
+#include <stdlib.h>
+#include <acess/sys.h>
 
 #define USE_CPUID	0
 
@@ -22,14 +23,12 @@ static void	cpuid(uint32_t Num, uint32_t *EAX, uint32_t *EBX, uint32_t *EDX, uin
 
 // === IMPORTS ===
 extern tLoadedLib	gLoadedLibraries[64];
-extern int	_SysSetFaultHandler(int (*Handler)(int));
+extern void	*_crt0_exit_handler;
+extern void	_stdio_init(void);
+extern void	_call_atexit_handlers(void);
 
 // === GLOBALS ===
-extern char **_envp;
-extern struct sFILE	_iob[];
-extern struct sFILE	*stdin;
-extern struct sFILE	*stdout;
-extern struct sFILE	*stderr;
+extern char **environ;
 // --- CPU Features ---
 #if USE_CPUID
 tCPUID	gCPU_Features;
@@ -44,10 +43,10 @@ tCPUID	gCPU_Features;
  * \param argv	Unused - Arguments (NULL for current version of ld-acess)
  * \param envp	Environment Pointer
  */
-int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
+int SoMain(UNUSED(uintptr_t, BaseAddress), UNUSED(int, argc), UNUSED(char **, argv), char **envp)
 {
 	// Init for env.c
-	_envp = envp;
+	environ = envp;
 
 	#if 0	
 	{
@@ -60,14 +59,8 @@ int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
 		}
 	}
 	#endif
-	
-	// Init FileIO Pointers
-	stdin = &_iob[0];
-	stdin->FD = 0;	stdin->Flags = FILE_FLAG_MODE_READ;
-	stdout = &_iob[1];
-	stdout->FD = 1;	stdout->Flags = FILE_FLAG_MODE_WRITE;
-	stderr = &_iob[2];
-	stderr->FD = 2;	stderr->Flags = FILE_FLAG_MODE_WRITE;
+
+	_stdio_init();	
 	
 	#if USE_CPUID
 	{
@@ -78,6 +71,8 @@ int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
 	}
 	#endif
 	
+	_crt0_exit_handler = _call_atexit_handlers;
+
 	// Set Error handler
 	_SysSetFaultHandler(ErrorHandler);
 	
@@ -87,6 +82,10 @@ int SoMain(unsigned int BaseAddress, int argc, char **argv, char **envp)
 int ErrorHandler(int Fault)
 {
 	 int	i;
+
+	extern void ldacess_DumpLoadedLibraries(void);	
+	ldacess_DumpLoadedLibraries();
+
 	fprintf(stderr, "ErrorHandler: (Fault = %i)\n", Fault);
 	fprintf(stderr, "Loaded Libraries:\n");
 	for( i = 0; i < 64; i ++ )