summary refs log tree commit diff
path: root/sysdeps/mach/hurd/fexecve.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-01-09 01:36:58 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-01-09 01:37:34 +0100
commit311ba8dc4416467947eff2ab327854f124226309 (patch)
treead9a00d6a87de80ddc241b60b2d52aad971fa10e /sysdeps/mach/hurd/fexecve.c
parentd7ff3f11b64a28273285d341f795217bbf18ac9c (diff)
downloadglibc-311ba8dc4416467947eff2ab327854f124226309.tar.gz
glibc-311ba8dc4416467947eff2ab327854f124226309.tar.xz
glibc-311ba8dc4416467947eff2ab327854f124226309.zip
hurd: Use the new file_exec_paths RPC
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.
Diffstat (limited to 'sysdeps/mach/hurd/fexecve.c')
-rw-r--r--sysdeps/mach/hurd/fexecve.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/mach/hurd/fexecve.c b/sysdeps/mach/hurd/fexecve.c
index a56a51bba1..c5679f197e 100644
--- a/sysdeps/mach/hurd/fexecve.c
+++ b/sysdeps/mach/hurd/fexecve.c
@@ -25,8 +25,9 @@
 int
 fexecve (int fd, char *const argv[], char *const envp[])
 {
-  error_t err = HURD_DPORT_USE (fd, _hurd_exec (__mach_task_self (), port,
-						argv, envp));
+  error_t err = HURD_DPORT_USE (fd, _hurd_exec_paths (__mach_task_self (),
+						      port, NULL, NULL,
+						      argv, envp));
   if (! err)
     err = EGRATUITOUS;
   return __hurd_fail (err);