Changes in uspace/lib/c/generic/libc.c [8a1fb09:df908b3] in mainline

File:

• uspace/lib/c/generic/libc.c (modified) (3 diffs)

uspace/lib/c/generic/libc.c

@@ -42 +42 @@
 
 #include <libc.h>
-#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <malloc.h>
 #include <tls.h>
+#include <thread.h>
 #include <fibril.h>
-#include <task.h>
+#include <ipc/ipc.h>
+#include <async.h>
+#include <async_rel.h>
+#include <as.h>
 #include <loader/pcb.h>
-#include "private/libc.h"
-#include "private/async.h"
-#include "private/async_sess.h"
-#include "private/malloc.h"
-#include "private/io.h"
 
-#ifdef CONFIG_RTLD
-#include <rtld/rtld.h>
-#endif
+extern int main(int argc, char *argv[]);
 
-static bool env_setup = false;
+void _exit(int status)
+{
+        thread_exit(status);
+}
 
 void __main(void *pcb_ptr)
 {
         /* Initialize user task run-time environment */
-        __malloc_init();
+        __heap_init();
         __async_init();
-        __async_sess_init();
-        
+        (void) async_rel_init();
         fibril_t *fibril = fibril_setup();
-        if (fibril == NULL)
-                abort();
-        
         __tcb_set(fibril->tcb);
         
@@ -75 +73 @@
         __pcb = (pcb_t *) pcb_ptr;
         
-        /* The basic run-time environment is setup */
-        env_setup = true;
-        
         int argc;
         char **argv;
         
-#ifdef __IN_SHARED_LIBC__
-        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
-                runtime_env = (runtime_env_t *) __pcb->rtld_runtime;
-        }
-#endif
-        /*
-         * Get command line arguments and initialize
-         * standard input and output
-         */
+        /* Get command line arguments and initialize
+           standard input and output */
         if (__pcb == NULL) {
                 argc = 0;
@@ -101 +89 @@
         }
         
-        /*
-         * Run main() and set task return value
-         * according the result
-         */
-        int retval = main(argc, argv);
-        exit(retval);
+        /* Run main() and set task return value
+           according the result */
+        (void) task_retval(main(argc, argv));
 }
 
-void exit(int status)
+void __exit(void)
 {
-        if (env_setup) {
-                __stdio_done();
-                task_retval(status);
-                fibril_teardown(__tcb_get()->fibril_data);
-        }
-        
-        __SYSCALL1(SYS_TASK_EXIT, false);
-        
-        /* Unreachable */
-        while (1);
-}
-
-void abort(void)
-{
-        __SYSCALL1(SYS_TASK_EXIT, true);
-        
-        /* Unreachable */
-        while (1);
+        __stdio_done();
+        fibril_teardown(__tcb_get()->fibril_data);
+        _exit(0);
 }