diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:03:01 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:03:01 +0000 |
commit | 14970231a38310b9561052a67b617138eeaad300 (patch) | |
tree | 35c201a651afa5d5e4fff241280081b3f88b9c2c /sysdeps/mach/hurd/execve.c | |
parent | f08c7420b5e8b017a1a47b880a62b15bdc588f4d (diff) | |
parent | 25ead03a3712d57df2208fe82f3d316eb8faeaf6 (diff) |
Merge commit 'refs/top-bases/t/extern_inline' into t/extern_inline
Diffstat (limited to 'sysdeps/mach/hurd/execve.c')
-rw-r--r-- | sysdeps/mach/hurd/execve.c | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/execve.c b/sysdeps/mach/hurd/execve.c index 6904fc6452..1c5b681d89 100644 --- a/sysdeps/mach/hurd/execve.c +++ b/sysdeps/mach/hurd/execve.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -18,6 +18,8 @@ #include <unistd.h> #include <hurd.h> #include <fcntl.h> +#include <stdlib.h> +#include <stdio.h> /* Replace the current process, executing FILE_NAME with arguments ARGV and environment ENVP. ARGV and ENVP are terminated by NULL pointers. */ @@ -25,16 +27,46 @@ int __execve (const char *file_name, char *const argv[], char *const envp[]) { error_t err; - file_t file = __file_name_lookup (file_name, O_EXEC, 0); + char *concat_name = NULL; + const char *abs_path; + file_t file = __file_name_lookup (file_name, O_EXEC, 0); if (file == MACH_PORT_NULL) return -1; + if (file_name[0] == '/') + { + /* Already an absolute path */ + abs_path = file_name; + } + else + { + /* Relative path */ + char *cwd = __getcwd (NULL, 0); + if (cwd == NULL) + { + __mach_port_deallocate (__mach_task_self (), file); + return -1; + } + + int res = __asprintf (&concat_name, "%s/%s", cwd, file_name); + free (cwd); + if (res == -1) + { + __mach_port_deallocate (__mach_task_self (), file); + return -1; + } + + abs_path = concat_name; + } + /* Hopefully this will not return. */ - err = _hurd_exec (__mach_task_self (), file, argv, envp); + err = _hurd_exec_paths (__mach_task_self (), file, + file_name, abs_path, argv, envp); /* Oh well. Might as well be tidy. */ __mach_port_deallocate (__mach_task_self (), file); + free (concat_name); return __hurd_fail (err); } |