mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 16:50:07 +00:00
311ba8dc44
From: Emilio Pozuelo Monfort <pochu27@gmail.com> From: Svante Signell <svante.signell@gmail.com> Pass the file paths of executable to the exec server, both relative and absolute, which exec needs to properly execute and avertise #!-scripts. Previously, the exec server tried to guess the name from argv[0] but argv[0] only contains the executable name by convention. * hurd/hurdexec.c (_hurd_exec): Deprecate function. (_hurd_exec_paths): New function. * hurd/hurd.h (_hurd_exec): Deprecate function. (_hurd_exec_paths): Declare function. * hurd/Versions: Export _hurd_exec_paths. * sysdeps/mach/hurd/execve.c: Include <stdlib.h> and <stdio.h> (__execve): Use __getcwd to build absolute path, and use _hurd_exec_paths instead of _hurd_exec. * sysdeps/mach/hurd/spawni.c: Likewise. * sysdeps/mach/hurd/fexecve.c: Use _hurd_exec_paths instead of _hurd_exec.
75 lines
2.1 KiB
C
75 lines
2.1 KiB
C
/* 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#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. */
|
|
int
|
|
__execve (const char *file_name, char *const argv[], char *const envp[])
|
|
{
|
|
error_t err;
|
|
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_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);
|
|
}
|
|
|
|
weak_alias (__execve, execve)
|