Changes in uspace/srv/loader/main.c [5a6cc679:a35b458] in mainline

File:

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

uspace/srv/loader/main.c

@@ -95 +95 @@
         task_id_t task_id;
         size_t len;
-        
+
         task_id = task_get_id();
-        
+
         if (!async_data_read_receive(&callid, &len)) {
                 async_answer_0(callid, EINVAL);
@@ -103 +103 @@
                 return;
         }
-        
+
         if (len > sizeof(task_id))
                 len = sizeof(task_id);
-        
+
         async_data_read_finalize(callid, &task_id, len);
         async_answer_0(rid, EOK);
@@ -120 +120 @@
         char *buf;
         errno_t rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL);
-        
+
         if (rc == EOK) {
                 if (cwd != NULL)
                         free(cwd);
-                
+
                 cwd = buf;
         }
-        
+
         async_answer_0(rid, rc);
 }
@@ -158 +158 @@
                 return;
         }
-        
+
         progname = name;
         program_fd = file;
@@ -174 +174 @@
         size_t buf_size;
         errno_t rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, &buf_size);
-        
+
         if (rc == EOK) {
                 /*
@@ -181 +181 @@
                 char *cur = buf;
                 int count = 0;
-                
+
                 while (cur < buf + buf_size) {
                         size_t arg_size = str_size(cur);
@@ -187 +187 @@
                         count++;
                 }
-                
+
                 /*
                  * Allocate new argv
@@ -197 +197 @@
                         return;
                 }
-                
+
                 /*
                  * Fill the new argv with argument pointers
@@ -205 +205 @@
                 while (cur < buf + buf_size) {
                         _argv[count] = cur;
-                        
+
                         size_t arg_size = str_size(cur);
                         cur += arg_size + 1;
@@ -211 +211 @@
                 }
                 _argv[count] = NULL;
-                
+
                 /*
                  * Copy temporary data to global variables
@@ -217 +217 @@
                 if (arg_buf != NULL)
                         free(arg_buf);
-                
+
                 if (argv != NULL)
                         free(argv);
-                
+
                 argc = count;
                 arg_buf = buf;
                 argv = _argv;
         }
-        
+
         async_answer_0(rid, rc);
 }
@@ -289 +289 @@
                 return 1;
         }
-        
+
         elf_set_pcb(&prog_info, &pcb);
-        
+
         pcb.cwd = cwd;
-        
+
         pcb.argc = argc;
         pcb.argv = argv;
-        
+
         pcb.inbox = inbox;
         pcb.inbox_entries = inbox_entries;
-        
+
         async_answer_0(rid, EOK);
         return 0;
@@ -317 +317 @@
         /* Set the task name. */
         task_set_name(progname);
-        
+
         /* Run program */
         DPRINTF("Reply OK\n");
@@ -323 +323 @@
         DPRINTF("Jump to entry point at %p\n", pcb.entry);
         entry_point_jmp(prog_info.finfo.entry, &pcb);
-        
+
         /* Not reached */
 }
@@ -339 +339 @@
                 return;
         }
-        
+
         connected = true;
-        
+
         /* Accept the connection */
         async_answer_0(iid, EOK);
-        
+
         /* Ignore parameters, the connection is already open */
         (void) icall;
-        
+
         while (true) {
                 errno_t retval;
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-                
+
                 if (!IPC_GET_IMETHOD(call))
                         exit(0);
-                
+
                 switch (IPC_GET_IMETHOD(call)) {
                 case LOADER_GET_TASKID:
@@ -382 +382 @@
                         break;
                 }
-                
+
                 async_answer_0(callid, retval);
         }
@@ -392 +392 @@
 {
         async_set_fallback_port_handler(ldr_connection, NULL);
-        
+
         /* Introduce this task to the NS (give it our task ID). */
         task_id_t id = task_get_id();
@@ -398 +398 @@
         if (rc != EOK)
                 return rc;
-        
+
         /* Create port */
         port_id_t port;
@@ -404 +404 @@
         if (rc != EOK)
                 return rc;
-        
+
         /* Register at naming service. */
         rc = service_register(SERVICE_LOADER);
         if (rc != EOK)
                 return rc;
-        
+
         async_manager();
-        
+
         /* Never reached */
         return 0;