X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdlib%2Fexit.c;h=fa91ade1876d2b75a1626356a37f4cc57f0d243d;hp=5cb2a508fe19838baa4e9e95f08707af90e671c4;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=492cae1767efcce269e5472dcf0a18e6abf546a1

diff --git a/functions/stdlib/exit.c b/functions/stdlib/exit.c
index 5cb2a50..fa91ade 100644
--- a/functions/stdlib/exit.c
+++ b/functions/stdlib/exit.c
@@ -1,7 +1,3 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* exit( int )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -11,32 +7,37 @@
 #include <stdlib.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
+
+/* TODO - "except that a function is called after any previously registered
+   functions that had already been called at the time it was registered.
+*/
+
+/* TODO: 32 is guaranteed. This should be dynamic but ATM gives problems
+   with my malloc.
+*/
+#define NUMBER_OF_SLOTS 40
 
-struct _PDCLIB_exitfunc_t * regstack = NULL;
+void (*_PDCLIB_exitstack[ NUMBER_OF_SLOTS ])( void ) = { _PDCLIB_closeall };
+size_t _PDCLIB_exitptr = NUMBER_OF_SLOTS;
 
 void exit( int status )
 {
-    struct _PDCLIB_exitfunc_t * next = regstack;
-    while ( next != NULL )
+    while ( _PDCLIB_exitptr < NUMBER_OF_SLOTS )
     {
-        next->func();
-        regstack = next->next;
-        free( next );
-        next = regstack;
+        _PDCLIB_exitstack[ _PDCLIB_exitptr++ ]();
     }
-    /* TODO: Flush and close open streams. Remove tmpfile() files. */
     _Exit( status );
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
-int main()
+int main( void )
 {
-    BEGIN_TESTS;
-    TESTCASE( NO_TESTDRIVER );
+    /* Unwinding of regstack tested in atexit(). */
     return TEST_RESULTS;
 }