X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstdlib.c;h=e05ddc2d4ed07316e1958507402cd992f91df514;hb=7d1c355c2843a140d5c474567c690402793aaa36;hp=ddd1234a15bf6c19fd9c711c8f86a6dcdfe36afd;hpb=7f9d69d6ea27607efe01e7513fd09a9a8319e5e5;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/stdlib.c b/Usermode/Libraries/libc.so_src/stdlib.c
index ddd1234a..e05ddc2d 100644
--- a/Usermode/Libraries/libc.so_src/stdlib.c
+++ b/Usermode/Libraries/libc.so_src/stdlib.c
@@ -2,32 +2,39 @@
  * AcessOS Basic C Library
  * stdlib.c
  */
-/**
- * \todo Move half of these to stdio
- */
 #include <acess/sys.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "lib.h"
 
-#define _stdout	1
-#define _stdin	0
+extern void	_stdio_cleanup(void);
 
-extern void	*_crt0_exit_handler;
+#define MAX_ATEXIT_HANDLERS	64	// Standard defines >=32
 
 // === PROTOTYPES ===
 EXPORT int	atoi(const char *str);
 EXPORT void	exit(int status);
 
 // === GLOBALS ===
-void	(*g_stdlib_exithandler)(void);
+typedef void (*stdlib_exithandler_t)(void);
+stdlib_exithandler_t	g_stdlib_exithandlers[MAX_ATEXIT_HANDLERS];
+ int	g_stdlib_num_exithandlers;
 
 // === CODE ===
-void atexit(void (*__func)(void))
+void _call_atexit_handlers(void)
+{
+	 int	i;
+	for( i = g_stdlib_num_exithandlers; i --; )
+		g_stdlib_exithandlers[i]();
+	_stdio_cleanup();
+}
+
+EXPORT void atexit(void (*__func)(void))
 {
-	g_stdlib_exithandler = __func;
-	// TODO: Replace with meta-function to allow multiple atexit() handlers
-	_crt0_exit_handler = __func;	
+	if( g_stdlib_num_exithandlers < MAX_ATEXIT_HANDLERS )
+	{
+		g_stdlib_exithandlers[g_stdlib_num_exithandlers++] = __func;
+	}
 }
 
 /**
@@ -36,8 +43,7 @@ void atexit(void (*__func)(void))
  */
 EXPORT void exit(int status)
 {
-	if( g_stdlib_exithandler )
-		g_stdlib_exithandler();
+	_call_atexit_handlers();
 	_exit(status);
 }
 
@@ -48,7 +54,7 @@ EXPORT void exit(int status)
  */
 EXPORT void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *))
 {
-	 int	i, j, min;
+	size_t	i, j, min;
 	// With 0 items, there's nothing to do and with 1 its already sorted
 	if(nmemb == 0 || nmemb == 1)	return;
 	
@@ -71,69 +77,6 @@ EXPORT void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void
 	}
 }
 
-/**
- * \fn EXPORT int atoi(const char *str)
- * \brief Convert a string to an integer
- */
-EXPORT int atoi(const char *str)
-{
-	 int	neg = 0;
-	 int	ret = 0;
-	
-	// NULL Check
-	if(!str)	return 0;
-	
-	while(*str == ' ' || *str == '\t')	str++;
-	
-	// Check for negative
-	if(*str == '-') {
-		neg = 1;
-		str++;
-	}
-	
-	if(*str == '0') {
-		str ++;
-		if(*str == 'x') {
-			str++;
-			// Hex
-			while( ('0' <= *str && *str <= '9')
-				|| ('A' <= *str && *str <= 'F' )
-				|| ('a' <= *str && *str <= 'f' )
-				)
-			{
-				ret *= 16;
-				if(*str <= '9') {
-					ret += *str - '0';
-				} else if (*str <= 'F') {
-					ret += *str - 'A' + 10;
-				} else {
-					ret += *str - 'a' + 10;
-				}
-				str++;
-			}
-		} else {
-			// Octal
-			while( '0' <= *str && *str <= '7' )
-			{
-				ret *= 8;
-				ret += *str - '0';
-				str++;
-			}
-		}
-	} else {
-		// Decimal
-		while( '0' <= *str && *str <= '9' )
-		{
-			ret *= 10;
-			ret += *str - '0';
-			str++;
-		}
-	}
-	
-	// Negate if needed
-	if(neg)	ret = -ret;
-	return ret;
-}
 
 int abs(int j) { return j < 0 ? -j : j; }
 long int labs(long int j) { return j < 0 ? -j : j; }