| 152,11 → 152,11 |
|---|
| static void loader_set_args(ipc_callid_t rid, ipc_call_t *request) |
| { |
| ipc_callid_t callid; |
| size_t buf_len, arg_len; |
| size_t buf_size, arg_size; |
| char *p; |
| int n; |
| |
| if (!ipc_data_write_receive(&callid, &buf_len)) { |
| if (!ipc_data_write_receive(&callid, &buf_size)) { |
| ipc_answer_0(callid, EINVAL); |
| ipc_answer_0(rid, EINVAL); |
| return; |
| 172,7 → 172,7 |
|---|
| argv = NULL; |
| } |
| |
| arg_buf = malloc(buf_len + 1); |
| arg_buf = malloc(buf_size + 1); |
| if (!arg_buf) { |
| ipc_answer_0(callid, ENOMEM); |
| ipc_answer_0(rid, ENOMEM); |
| 179,10 → 179,9 |
|---|
| return; |
| } |
| |
| ipc_data_write_finalize(callid, arg_buf, buf_len); |
| ipc_answer_0(rid, EOK); |
| ipc_data_write_finalize(callid, arg_buf, buf_size); |
| |
| arg_buf[buf_len] = '\0'; |
| arg_buf[buf_size] = '\0'; |
| |
| /* |
| * Count number of arguments |
| 189,9 → 188,9 |
|---|
| */ |
| p = arg_buf; |
| n = 0; |
| while (p < arg_buf + buf_len) { |
| arg_len = strlen(p); |
| p = p + arg_len + 1; |
| while (p < arg_buf + buf_size) { |
| arg_size = str_size(p); |
| p = p + arg_size + 1; |
| ++n; |
| } |
| |
| 200,26 → 199,27 |
|---|
| |
| if (argv == NULL) { |
| free(arg_buf); |
| ipc_answer_0(callid, ENOMEM); |
| ipc_answer_0(rid, ENOMEM); |
| return; |
| } |
| |
| |
| /* |
| * Fill argv with argument pointers |
| */ |
| p = arg_buf; |
| n = 0; |
| while (p < arg_buf + buf_len) { |
| while (p < arg_buf + buf_size) { |
| argv[n] = p; |
| |
| arg_len = strlen(p); |
| p = p + arg_len + 1; |
| arg_size = str_size(p); |
| p = p + arg_size + 1; |
| ++n; |
| } |
| |
| argc = n; |
| argv[n] = NULL; |
| |
| ipc_answer_0(rid, EOK); |
| } |
| |
| /** Load the previously selected program. |
| 233,7 → 233,7 |
|---|
| int rc; |
| |
| rc = elf_load_file(pathname, 0, 0, &prog_info); |
| if (rc < 0) { |
| if (rc != EE_OK) { |
| DPRINTF("Failed to load executable '%s'.\n", pathname); |
| ipc_answer_0(rid, EINVAL); |
| return 1; |
| 253,7 → 253,7 |
|---|
| |
| printf("Load ELF interpreter '%s'\n", prog_info.interp); |
| rc = elf_load_file(prog_info.interp, 0, 0, &interp_info); |
| if (rc < 0) { |
| if (rc != EE_OK) { |
| DPRINTF("Failed to load interpreter '%s.'\n", |
| prog_info.interp); |
| ipc_answer_0(rid, EINVAL); |
| 283,7 → 283,7 |
|---|
| const char *cp; |
| |
| /* Set the task name. */ |
| cp = strrchr(pathname, '/'); |
| cp = str_rchr(pathname, '/'); |
| cp = (cp == NULL) ? pathname : (cp + 1); |
| task_set_name(cp); |
| |