X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstub.c;h=922943e1e71a7d4a120e583f85ca0e07c5e58d1c;hb=d7f2b37cad318f38d83d2249b8ff97f13ce973d8;hp=5f16c05e9597030eb4774455cfd17a82b47cabc9;hpb=a14bbb9609fd00801c65328838a42db75af486ec;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stub.c b/Usermode/Libraries/libc.so_src/stub.c
index 5f16c05e..922943e1 100644
--- a/Usermode/Libraries/libc.so_src/stub.c
+++ b/Usermode/Libraries/libc.so_src/stub.c
@@ -28,7 +28,7 @@ extern void	_stdio_init(void);
 extern void	_call_atexit_handlers(void);
 
 // === GLOBALS ===
-extern char **_envp;
+extern char **environ;
 // --- CPU Features ---
 #if USE_CPUID
 tCPUID	gCPU_Features;
@@ -45,20 +45,7 @@ tCPUID	gCPU_Features;
  */
 int SoMain(UNUSED(uintptr_t, BaseAddress), UNUSED(int, argc), UNUSED(char **, argv), char **envp)
 {
-	// Init for env.c
-	_envp = 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
+	environ = envp;
 
 	_stdio_init();	
 	
@@ -76,12 +63,16 @@ int SoMain(UNUSED(uintptr_t, BaseAddress), UNUSED(int, argc), UNUSED(char **, ar
 	// 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 ++ )
@@ -94,11 +85,6 @@ int ErrorHandler(int Fault)
 	return -1;
 }
 
-EXPORT int *libc_geterrno()
-{
-	return &_errno;
-}
-
 #if USE_CPUID
 /**
  * \brief Call the CPUID opcode