X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstub.c;h=922943e1e71a7d4a120e583f85ca0e07c5e58d1c;hb=92c5980925e773c6e1d6775c50c9d86c77b84d23;hp=20e796eecc759eab2e01128cab04dc83be8ddad0;hpb=166ddd4673dc43e28659516b3f521ba357b9ab27;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index 20e796ee..922943e1 100644
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -4,6 +4,7 @@
 #include "stdio_int.h"
 #include "lib.h"
 #include <stdio.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;
@@ -46,28 +45,9 @@ tCPUID	gCPU_Features;
  */
 int SoMain(UNUSED(uintptr_t, BaseAddress), UNUSED(int, argc), UNUSED(char **, argv), char **envp)
 {
-	// Init for env.c
-	_envp = envp;
+	environ = envp;
 
-	#if 0	
-	{
-		 int	i = 0;
-		char	**tmp;
-		_SysDebug("envp = %p", envp);
-		for(tmp = envp; *tmp; tmp++,i++)
-		{
-			_SysDebug("envp[%i] = '%s'", i, *tmp);
-		}
-	}
-	#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,15 +58,21 @@ int SoMain(UNUSED(uintptr_t, BaseAddress), UNUSED(int, argc), UNUSED(char **, ar
 	}
 	#endif
 	
+	_crt0_exit_handler = _call_atexit_handlers;
+
 	// Set Error handler
 	_SysSetFaultHandler(ErrorHandler);
 	
-	return 1;
+	return 0;
 }
 
 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 ++ )