Changeset c98e6ee in mainline for uspace/lib/libc/generic/libc.c

Timestamp:

2008-07-08T16:05:45Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f93f168

Parents:

b7f9087

Message:

Merge program-loader related stuff from dynload branch to trunk. (huge)

File:

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

uspace/lib/libc/generic/libc.c

@@ -49 +49 @@
 #include <async.h>
 #include <as.h>
+#include <loader/pcb.h>
 
 extern char _heap;
+extern int main(int argc, char *argv[]);
 
 void _exit(int status)
@@ -57 +59 @@
 }
 
-void __main(void)
+void __main(void *pcb_ptr)
 {
         fibril_t *f;
+        int argc;
+        char **argv;
 
         (void) as_area_create(&_heap, 1, AS_AREA_WRITE | AS_AREA_READ);
@@ -67 +71 @@
         
         open_console();
+
+        /* Save the PCB pointer */
+        __pcb = (pcb_t *)pcb_ptr;
+
+        if (__pcb == NULL) {
+                argc = 0;
+                argv = NULL;
+        } else {
+                argc = __pcb->argc;
+                argv = __pcb->argv;
+        }
+
+        main(argc, argv);
 }