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

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/lib/c/generic/libc.c

@@ -62 +62 @@
 void __main(void *pcb_ptr)
 {
-        int retval;
-
+        /* Initialize user task run-time environment */
         __heap_init();
         __async_init();
@@ -75 +74 @@
         char **argv;
         
+        /* Get command line arguments and initialize
+           standard input and output */
         if (__pcb == NULL) {
                 argc = 0;
@@ -86 +87 @@
         }
         
-        retval = main(argc, argv);
-
-        __stdio_done();
-        (void) task_retval(retval);
+        /* Run main() and set task return value
+           according the result */
+        (void) task_retval(main(argc, argv));
 }
 
 void __exit(void)
 {
+        __stdio_done();
         fibril_teardown(__tcb_get()->fibril_data);
         _exit(0);