Changeset 2f57690 in mainline for uspace/srv

Timestamp:

2009-03-03T12:41:39Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

deca67b

Parents:

561db3f

Message:

cstyle

File:

• uspace/srv/loader/main.c (modified) (22 diffs)

uspace/srv/loader/main.c

@@ -28 +28 @@
 
 /** @addtogroup loader
- * @brief       Loads and runs programs from VFS.
+ * @brief Loads and runs programs from VFS.
  * @{
- */ 
+ */
 /**
  * @file
- * @brief       Loads and runs programs from VFS.
+ * @brief Loads and runs programs from VFS.
  *
  * The program loader is a special init binary. Its image is used
@@ -89 +89 @@
         task_id_t task_id;
         size_t len;
-
+        
         task_id = task_get_id();
-
+        
         if (!ipc_data_read_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
@@ -97 +97 @@
                 return;
         }
-
-        if (len > sizeof(task_id)) len = sizeof(task_id);
-
+        
+        if (len > sizeof(task_id))
+                len = sizeof(task_id);
+        
         ipc_data_read_finalize(callid, &task_id, len);
         ipc_answer_0(rid, EOK);
@@ -115 +116 @@
         size_t len;
         char *name_buf;
-
+        
         if (!ipc_data_write_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
@@ -121 +122 @@
                 return;
         }
-
+        
         name_buf = malloc(len + 1);
         if (!name_buf) {
@@ -128 +129 @@
                 return;
         }
-
+        
         ipc_data_write_finalize(callid, name_buf, len);
         ipc_answer_0(rid, EOK);
-
+        
         if (pathname != NULL) {
                 free(pathname);
                 pathname = NULL;
         }
-
+        
         name_buf[len] = '\0';
         pathname = name_buf;
@@ -152 +153 @@
         char *p;
         int n;
-
+        
         if (!ipc_data_write_receive(&callid, &buf_len)) {
                 ipc_answer_0(callid, EINVAL);
@@ -158 +159 @@
                 return;
         }
-
+        
         if (arg_buf != NULL) {
                 free(arg_buf);
                 arg_buf = NULL;
         }
-
+        
         if (argv != NULL) {
                 free(argv);
                 argv = NULL;
         }
-
+        
         arg_buf = malloc(buf_len + 1);
         if (!arg_buf) {
@@ -175 +176 @@
                 return;
         }
-
+        
         ipc_data_write_finalize(callid, arg_buf, buf_len);
         ipc_answer_0(rid, EOK);
-
+        
         arg_buf[buf_len] = '\0';
-
+        
         /*
          * Count number of arguments
@@ -191 +192 @@
                 ++n;
         }
-
+        
         /* Allocate argv */
         argv = malloc((n + 1) * sizeof(char *));
-
+        
         if (argv == NULL) {
                 free(arg_buf);
@@ -201 +202 @@
                 return;
         }
-
+        
         /*
          * Fill argv with argument pointers
@@ -209 +210 @@
         while (p < arg_buf + buf_len) {
                 argv[n] = p;
-
+                
                 arg_len = strlen(p);
                 p = p + arg_len + 1;
                 ++n;
         }
-
+        
         argc = n;
         argv[n] = NULL;
@@ -228 +229 @@
 {
         int rc;
-
+        
         rc = elf_load_file(pathname, 0, &prog_info);
         if (rc < 0) {
@@ -235 +236 @@
                 return 1;
         }
-
+        
         elf_create_pcb(&prog_info, &pcb);
-
+        
         pcb.argc = argc;
         pcb.argv = argv;
-
+        
         if (prog_info.interp == NULL) {
                 /* Statically linked program */
@@ -247 +248 @@
                 return 0;
         }
-
+        
         rc = elf_load_file(prog_info.interp, 0, &interp_info);
         if (rc < 0) {
@@ -255 +256 @@
                 return 1;
         }
-
+        
         is_dyn_linked = true;
         ipc_answer_0(rid, EOK);
-
+        
         return 0;
 }
@@ -272 +273 @@
 {
         const char *cp;
-
+        
         /* Set the task name. */
         cp = strrchr(pathname, '/');
         cp = (cp == NULL) ? pathname : (cp + 1);
         task_set_name(cp);
-
+        
         if (is_dyn_linked == true) {
                 /* Dynamically linked program */
@@ -283 +284 @@
                 DPRINTF("Entry point: 0x%lx\n", interp_info.entry);
                 close_console();
-
+                
                 ipc_answer_0(rid, EOK);
                 elf_run(&interp_info, &pcb);
-
         } else {
                 /* Statically linked program */
@@ -307 +307 @@
         ipc_call_t call;
         int retval;
-
+        
         /* Already have a connection? */
         if (connected) {
@@ -313 +313 @@
                 return;
         }
-
+        
         connected = true;
         
         /* Accept the connection */
         ipc_answer_0(iid, EOK);
-
+        
         /* Ignore parameters, the connection is already open */
-        (void)iid; (void)icall;
-
+        (void) iid;
+        (void) icall;
+        
         while (1) {
                 callid = async_get_call(&call);
-
+                
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
@@ -361 +362 @@
 {
         ipcarg_t phonead;
-
+        
         connected = false;
         
         /* Set a handler of incomming connections. */
         async_set_client_connection(loader_connection);
-
+        
         /* Register at naming service. */
         if (ipc_connect_to_me(PHONE_NS, SERVICE_LOAD, 0, 0, &phonead) != 0) 
@@ -372 +373 @@
         
         async_manager();
-
+        
         /* Never reached */
         return 0;