| /branches/sparc/uspace/lib/libc/generic/udebug.c |
|---|
| File deleted |
| /branches/sparc/uspace/lib/libc/generic/loader.c |
|---|
| File deleted |
| /branches/sparc/uspace/lib/libc/generic/ipc.c |
|---|
| 847,7 → 847,7 |
| * |
| * @return Zero on success or a value from @ref errno.h on failure. |
| */ |
| int ipc_data_read_finalize(ipc_callid_t callid, const void *src, size_t size) |
| int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size) |
| { |
| return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) size); |
| } |
| 860,7 → 860,7 |
| * |
| * @return Zero on success or a negative error code from errno.h. |
| */ |
| int ipc_data_write_start(int phoneid, const void *src, size_t size) |
| int ipc_data_write_start(int phoneid, void *src, size_t size) |
| { |
| return async_req_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src, |
| (ipcarg_t) size); |
| 909,18 → 909,6 |
| { |
| return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size); |
| } |
| #include <kernel/syscall/sysarg64.h> |
| /** Connect to a task specified by id. |
| */ |
| int ipc_connect_kbox(task_id_t id) |
| { |
| sysarg64_t arg; |
| arg.value = (unsigned long long) id; |
| return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg); |
| } |
| /** @} |
| */ |
| /branches/sparc/uspace/lib/libc/generic/vfs/canonify.c |
|---|
| 36,7 → 36,6 |
| */ |
| #include <stdlib.h> |
| #include <vfs/canonify.h> |
| /** Token types used for tokenization of path. */ |
| typedef enum { |
| /branches/sparc/uspace/lib/libc/generic/vfs/vfs.c |
|---|
| 116,7 → 116,7 |
| return vfs_phone; |
| } |
| static int device_get_handle(const char *name, dev_handle_t *handle) |
| static int device_get_handle(char *name, dev_handle_t *handle) |
| { |
| int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, |
| 0); |
| 364,9 → 364,9 |
| } |
| } |
| ipcarg_t newoffs; |
| off_t newoffs; |
| rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence, |
| &newoffs); |
| (ipcarg_t)&newoffs); |
| async_serialize_end(); |
| futex_up(&vfs_phone_futex); |
| 374,7 → 374,7 |
| if (rc != EOK) |
| return (off_t) -1; |
| return (off_t) newoffs; |
| return newoffs; |
| } |
| int ftruncate(int fildes, off_t length) |
| 599,7 → 599,6 |
| cwd_path = pa; |
| cwd_len = pa_len; |
| futex_up(&cwd_futex); |
| return EOK; |
| } |
| char *getcwd(char *buf, size_t size) |
| /branches/sparc/uspace/lib/libc/generic/task.c |
|---|
| 34,10 → 34,14 |
| */ |
| #include <task.h> |
| #include <ipc/ipc.h> |
| #include <ipc/loader.h> |
| #include <libc.h> |
| #include <string.h> |
| #include <stdlib.h> |
| #include <async.h> |
| #include <errno.h> |
| #include <loader/loader.h> |
| #include <vfs/vfs.h> |
| task_id_t task_get_id(void) |
| { |
| 48,62 → 52,134 |
| return task_id; |
| } |
| /** Create a new task by running an executable from the filesystem. |
| static int task_spawn_loader(void) |
| { |
| int phone_id, rc; |
| rc = __SYSCALL1(SYS_PROGRAM_SPAWN_LOADER, (sysarg_t) &phone_id); |
| if (rc != 0) |
| return rc; |
| return phone_id; |
| } |
| static int loader_set_args(int phone_id, const char *argv[]) |
| { |
| aid_t req; |
| ipc_call_t answer; |
| ipcarg_t rc; |
| const char **ap; |
| char *dp; |
| char *arg_buf; |
| size_t buffer_size; |
| size_t len; |
| /* |
| * Serialize the arguments into a single array. First |
| * compute size of the buffer needed. |
| */ |
| ap = argv; |
| buffer_size = 0; |
| while (*ap != NULL) { |
| buffer_size += strlen(*ap) + 1; |
| ++ap; |
| } |
| arg_buf = malloc(buffer_size); |
| if (arg_buf == NULL) return ENOMEM; |
| /* Now fill the buffer with null-terminated argument strings */ |
| ap = argv; |
| dp = arg_buf; |
| while (*ap != NULL) { |
| strcpy(dp, *ap); |
| dp += strlen(*ap) + 1; |
| ++ap; |
| } |
| /* Send serialized arguments to the loader */ |
| req = async_send_0(phone_id, LOADER_SET_ARGS, &answer); |
| rc = ipc_data_write_start(phone_id, (void *)arg_buf, buffer_size); |
| if (rc != EOK) { |
| async_wait_for(req, NULL); |
| return rc; |
| } |
| async_wait_for(req, &rc); |
| if (rc != EOK) return rc; |
| /* Free temporary buffer */ |
| free(arg_buf); |
| return EOK; |
| } |
| /** Create a new task by running an executable from VFS. |
| * |
| * This is really just a convenience wrapper over the more complicated |
| * loader API. |
| * |
| * @param path pathname of the binary to execute |
| * @param argv command-line arguments |
| * @return ID of the newly created task or zero on error. |
| */ |
| task_id_t task_spawn(const char *path, char *const argv[]) |
| task_id_t task_spawn(const char *path, const char *argv[]) |
| { |
| loader_t *ldr; |
| task_id_t task_id; |
| int phone_id; |
| ipc_call_t answer; |
| aid_t req; |
| int rc; |
| ipcarg_t retval; |
| /* Spawn a program loader. */ |
| ldr = loader_spawn(); |
| if (ldr == NULL) |
| char *pa; |
| size_t pa_len; |
| pa = absolutize(path, &pa_len); |
| if (!pa) |
| return 0; |
| /* Get task ID. */ |
| rc = loader_get_task_id(ldr, &task_id); |
| if (rc != EOK) |
| goto error; |
| /* Spawn a program loader */ |
| phone_id = task_spawn_loader(); |
| if (phone_id < 0) |
| return 0; |
| /* Send program pathname. */ |
| rc = loader_set_pathname(ldr, path); |
| /* |
| * Say hello so that the loader knows the incoming connection's |
| * phone hash. |
| */ |
| rc = async_req_0_0(phone_id, LOADER_HELLO); |
| if (rc != EOK) |
| goto error; |
| return 0; |
| /* Send arguments. */ |
| rc = loader_set_args(ldr, argv); |
| if (rc != EOK) |
| /* Send program pathname */ |
| req = async_send_0(phone_id, LOADER_SET_PATHNAME, &answer); |
| rc = ipc_data_write_start(phone_id, (void *)pa, pa_len); |
| if (rc != EOK) { |
| async_wait_for(req, NULL); |
| return 1; |
| } |
| async_wait_for(req, &retval); |
| if (retval != EOK) |
| goto error; |
| /* Load the program. */ |
| rc = loader_load_program(ldr); |
| /* Send arguments */ |
| rc = loader_set_args(phone_id, argv); |
| if (rc != EOK) |
| goto error; |
| /* Run it. */ |
| /* Load the program. */ |
| rc = loader_run(ldr); |
| /* Request loader to start the program */ |
| rc = async_req_0_0(phone_id, LOADER_RUN); |
| if (rc != EOK) |
| goto error; |
| /* Success */ |
| ipc_hangup(phone_id); |
| return 1; |
| free(ldr); |
| return task_id; |
| /* Error exit */ |
| error: |
| loader_abort(ldr); |
| free(ldr); |
| ipc_hangup(phone_id); |
| return 0; |
| } |
| /branches/sparc/uspace/lib/libc/generic/string.c |
|---|
| 1,7 → 1,5 |
| /* |
| * Copyright (c) 2005 Martin Decky |
| * Copyright (C) 1998 by Wes Peters <wes@softweyr.com> |
| * Copyright (c) 1988, 1993 The Regents of the University of California. |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| 398,52 → 396,5 |
| return (char *) memcpy(ret, s1, len); |
| } |
| /* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */ |
| char * strtok_r(char *s, const char *delim, char **last) |
| { |
| char *spanp, *tok; |
| int c, sc; |
| if (s == NULL && (s = *last) == NULL) |
| return (NULL); |
| cont: |
| c = *s++; |
| for (spanp = (char *)delim; (sc = *spanp++) != 0;) { |
| if (c == sc) |
| goto cont; |
| } |
| if (c == 0) { /* no non-delimiter characters */ |
| *last = NULL; |
| return (NULL); |
| } |
| tok = s - 1; |
| for (;;) { |
| c = *s++; |
| spanp = (char *)delim; |
| do { |
| if ((sc = *spanp++) == c) { |
| if (c == 0) |
| s = NULL; |
| else |
| s[-1] = '\0'; |
| *last = s; |
| return (tok); |
| } |
| } while (sc != 0); |
| } |
| } |
| /* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */ |
| char * strtok(char *s, const char *delim) |
| { |
| static char *last; |
| return (strtok_r(s, delim, &last)); |
| } |
| /** @} |
| */ |
| /branches/sparc/uspace/lib/libc/generic/smc.c |
|---|
| 34,7 → 34,6 |
| #include <libc.h> |
| #include <sys/types.h> |
| #include <smc.h> |
| int smc_coherence(void *address, size_t size) |
| { |
| /branches/sparc/uspace/lib/libc/generic/time.c |
|---|
| 47,8 → 47,6 |
| #include <as.h> |
| #include <ddi.h> |
| #include <time.h> |
| /* Pointers to public variables with time */ |
| struct { |
| volatile sysarg_t seconds1; |
| /branches/sparc/uspace/lib/libc/generic/tls.c |
|---|
| 116,7 → 116,7 |
| tcb_t *tcb; |
| size = ALIGN_UP(size, &_tls_alignment); |
| *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size); |
| *data = memalign(&_tls_alignment, sizeof(tcb_t) + size); |
| tcb = (tcb_t *) (*data + size); |
| tcb->self = tcb; |