Index: uspace/lib/posix/src/sys/mman.c =================================================================== --- uspace/lib/posix/src/sys/mman.c (revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e) +++ uspace/lib/posix/src/sys/mman.c (revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e) @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libposix + * @{ + */ +/** @file + */ + +#define LIBPOSIX_INTERNAL +#define __POSIX_DEF__(x) posix_##x + +#include "../internal/common.h" +#include +#include +#include +#include + +void *posix_mmap(void *start, size_t length, int prot, int flags, int fd, + __POSIX_DEF__(off_t) offset) +{ + if (!start) + start = AS_AREA_ANY; + +// if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE))) +// return MAP_FAILED; + + if (!(flags & MAP_ANONYMOUS)) + return MAP_FAILED; + + return as_area_create(start, length, prot, AS_AREA_UNPAGED); +} + +int posix_munmap(void *start, size_t length) +{ + int rc = as_area_destroy(start); + if (rc != EOK) { + errno = rc; + return -1; + } + return 0; +} + +/** @} + */ Index: uspace/lib/posix/src/sys/stat.c =================================================================== --- uspace/lib/posix/src/sys/stat.c (revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e) +++ uspace/lib/posix/src/sys/stat.c (revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e) @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2011 Jiri Zarevucky + * Copyright (c) 2011 Petr Koupy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libposix + * @{ + */ +/** @file File status handling. + */ + +#define LIBPOSIX_INTERNAL +#define __POSIX_DEF__(x) posix_##x + +#include "../internal/common.h" +#include "posix/sys/stat.h" +#include "libc/vfs/vfs.h" + +#include +#include "libc/mem.h" + +/** + * Convert HelenOS stat struct into POSIX stat struct (if possible). + * + * @param dest POSIX stat struct. + * @param src HelenOS stat struct. + * + * @return 0 on success, -1 on error. + */ +static int stat_to_posix(struct posix_stat *dest, vfs_stat_t *src) +{ + memset(dest, 0, sizeof(struct posix_stat)); + + dest->st_dev = src->service; + dest->st_ino = src->index; + + /* HelenOS doesn't support permissions, so we set them all */ + dest->st_mode = S_IRWXU | S_IRWXG | S_IRWXO; + if (src->is_file) { + dest->st_mode |= S_IFREG; + } + if (src->is_directory) { + dest->st_mode |= S_IFDIR; + } + + dest->st_nlink = src->lnkcnt; + dest->st_size = src->size; + + if (src->size > INT64_MAX) { + errno = ERANGE; + return -1; + } + + return 0; +} + +/** + * Retrieve file status for file associated with file descriptor. + * + * @param fd File descriptor of the opened file. + * @param st Status structure to be filled with information. + * @return Zero on success, -1 otherwise. + */ +int posix_fstat(int fd, struct posix_stat *st) +{ + vfs_stat_t hst; + if (failed(vfs_stat(fd, &hst))) + return -1; + return stat_to_posix(st, &hst); +} + +/** + * Retrieve file status for symbolic link. + * + * @param path Path to the symbolic link. + * @param st Status structure to be filled with information. + * @return Zero on success, -1 otherwise. + */ +int posix_lstat(const char *restrict path, struct posix_stat *restrict st) +{ + /* There are currently no symbolic links in HelenOS. */ + return posix_stat(path, st); +} + +/** + * Retrieve file status for regular file (or symbolic link target). + * + * @param path Path to the file/link. + * @param st Status structure to be filled with information. + * @return Zero on success, -1 otherwise. + */ +int posix_stat(const char *restrict path, struct posix_stat *restrict st) +{ + vfs_stat_t hst; + if (failed(vfs_stat_path(path, &hst))) + return -1; + return stat_to_posix(st, &hst); +} + +/** + * Change permission bits for the file if possible. + * + * @param path Path to the file. + * @param mode Permission bits to be set. + * @return Zero on success, -1 otherwise. + */ +int posix_chmod(const char *path, posix_mode_t mode) +{ + /* HelenOS doesn't support permissions, return success. */ + return 0; +} + +/** + * Set the file mode creation mask of the process. + * + * @param mask Set permission bits are cleared in the related creation + * functions. Non-permission bits are ignored. + * @return Previous file mode creation mask. + */ +posix_mode_t posix_umask(posix_mode_t mask) +{ + /* HelenOS doesn't support permissions, return empty mask. */ + return 0; +} + +/** + * Create a directory. + * + * @param path Path to the new directory. + * @param mode Permission bits to be set. + * @return Zero on success, -1 otherwise. + */ +int posix_mkdir(const char *path, posix_mode_t mode) +{ + if (failed(vfs_link_path(path, KIND_DIRECTORY, NULL))) + return -1; + else + return 0; +} + +/** @} + */ Index: uspace/lib/posix/src/sys/wait.c =================================================================== --- uspace/lib/posix/src/sys/wait.c (revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e) +++ uspace/lib/posix/src/sys/wait.c (revision df2e5514fa8f0044ee3ce752a6fd5cf72425718e) @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2011 Petr Koupy + * Copyright (c) 2011 Jiri Zarevucky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libposix + * @{ + */ +/** @file Support for waiting. + */ + +#define LIBPOSIX_INTERNAL +#define __POSIX_DEF__(x) posix_##x + +#include "../internal/common.h" +#include "posix/sys/wait.h" + +#include "libc/task.h" +#include + +#include + +#include "posix/limits.h" +#include "posix/signal.h" + +int __posix_wifexited(int status) { + return status != INT_MIN; +} + +int __posix_wexitstatus(int status) { + assert(__posix_wifexited(status)); + return status; +} + +int __posix_wifsignaled(int status) { + return status == INT_MIN; +} + +int __posix_wtermsig(int status) { + assert(__posix_wifsignaled(status)); + /* There is no way to distinguish reason + * for unexpected termination at the moment. + */ + return SIGABRT; +} + +/** + * Wait for any child process to stop or terminate. + * + * @param stat_ptr Location of the final status code of the child process. + * @return ID of the child process for which status is reported, + * -1 on signal interrupt, (pid_t)-1 otherwise. + */ +posix_pid_t posix_wait(int *stat_ptr) +{ + /* HelenOS does not support this. */ + errno = ENOSYS; + return (posix_pid_t) -1; +} + +/** + * Wait for a child process to stop or terminate. + * + * @param pid What child process shall the caller wait for. See POSIX manual + * for details. + * @param stat_ptr Location of the final status code of the child process. + * @param options Constraints of the waiting. See POSIX manual for details. + * @return ID of the child process for which status is reported, + * -1 on signal interrupt, 0 if non-blocking wait is requested but there is + * no child process whose status can be reported, (pid_t)-1 otherwise. + */ +posix_pid_t posix_waitpid(posix_pid_t pid, int *stat_ptr, int options) +{ + assert(stat_ptr != NULL); + assert(options == 0 /* None of the options are supported. */); + + task_exit_t texit; + int retval; + + if (failed(task_wait_task_id((task_id_t) pid, &texit, &retval))) { + /* Unable to retrieve status. */ + return (posix_pid_t) -1; + } + + if (texit == TASK_EXIT_NORMAL) { + // FIXME: relies on application not returning this value + assert(retval != INT_MIN); + *stat_ptr = retval; + } else { + /* Reserve the lowest value for unexpected termination. */ + *stat_ptr = INT_MIN; + } + + return pid; +} + +/** @} + */