Changeset c98e6ee in mainline for uspace/app/init/init.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/app/init/init.c (modified) (4 diffs)

uspace/app/init/init.c

@@ -46 +46 @@
 #include "version.h"
 
-#define BUF_SIZE 150000
-
-static char *buf;
-
 static void console_wait(void)
 {
@@ -83 +79 @@
 static void spawn(char *fname)
 {
+        char *argv[2];
+
         printf(NAME ": Spawning %s\n", fname);
-        
-        int fd = open(fname, O_RDONLY);
-        if (fd >= 0) {
-        
-                ssize_t rd;
-                size_t len = 0;
-                
-                // FIXME: cannot do long reads yet
-                do {
-                        rd = read(fd, buf + len, 1024);
-                        if (rd > 0)
-                                len += rd;
-                        
-                } while (rd > 0);
-                
-                if (len > 0) {
-                        task_spawn(buf, len);
-                        sleep(1);       // FIXME
-                }
-                
-                close(fd);
+
+        argv[0] = fname;
+        argv[1] = NULL;
+
+        if (task_spawn(fname, argv) != 0) {
+                /* Success */
+                sleep(1);
         }
 }
@@ -118 +102 @@
         }
         
-        buf = malloc(BUF_SIZE);
-        
         // FIXME: spawn("/sbin/pci");
         spawn("/sbin/fb");
@@ -130 +112 @@
         spawn("/sbin/fat");
         spawn("/sbin/tetris");
+        spawn("/sbin/cli");
         // FIXME: spawn("/sbin/tester");
         spawn("/sbin/klog");
         
-        free(buf);
         return 0;
 }