Changes in uspace/lib/c/generic/libc.c [47b7006:7171760] in mainline

File:

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

uspace/lib/c/generic/libc.c

@@ -41 +41 @@
  */
 
-#include <stdio.h>
-#include <unistd.h>
+#include <libc.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <tls.h>
 #include <fibril.h>
@@ -51 +49 @@
 #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
 
 static bool env_setup = false;
@@ -62 +63 @@
         __malloc_init();
         __async_init();
-        __async_sess_init();
         
         fibril_t *fibril = fibril_setup();
@@ -79 +79 @@
         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
@@ -86 +91 @@
                 argc = 0;
                 argv = NULL;
-                __stdio_init(0, NULL);
+                __stdio_init(0);
         } else {
                 argc = __pcb->argc;
                 argv = __pcb->argv;
-                __stdio_init(__pcb->filc, __pcb->filv);
+                __stdio_init(__pcb->filc);
                 (void) chdir(__pcb->cwd);
         }