X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstub.c;h=f723d54427b782c4946f3c8ed1f4fbc1e95ef2d5;hb=edddd69f17803d29b7f435da85ef23b7a5430c1f;hp=3cab984df2eea9bc15d8a3561e6151704bb31210;hpb=40b3565d79c0fd55f83e6470a458945efa21f6da;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index 3cab984d..f723d544 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;
 // --- CPU Features ---
 #if USE_CPUID
 tCPUID	gCPU_Features;
@@ -44,18 +43,24 @@ 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;
-	
-	// 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;
+
+	#if 0	
+	{
+		 int	i = 0;
+		char	**tmp;
+		_SysDebug("envp = %p", envp);
+		for(tmp = envp; *tmp; tmp++,i++)
+		{
+			_SysDebug("envp[%i] = '%s'", i, *tmp);
+		}
+	}
+	#endif
+
+	_stdio_init();	
 	
 	#if USE_CPUID
 	{
@@ -66,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);