D49733.1792562863.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D49733.1792562863.diff
View Options

	diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
	--- a/lib/libc/gen/exec.c
	+++ b/lib/libc/gen/exec.c
	@@ -136,7 +136,7 @@
	int
	execvp(const char name, char const *argv)
	{
	- return (execvpe(name, argv, environ));
	+ return (__libc_execvpe(name, argv, environ));
	}

	static int
	@@ -288,7 +288,7 @@
	}

	int
	-execvpe(const char name, char const argv[], char * const envp[])
	+__libc_execvpe(const char name, char const argv[], char * const envp[])
	{
	const char *path;

	@@ -298,3 +298,5 @@

	return (execvPe(name, path, argv, envp));
	}
	+
	+__weak_reference(__libc_execvpe, execvpe);
	diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c
	--- a/lib/libc/gen/posix_spawn.c
	+++ b/lib/libc/gen/posix_spawn.c
	@@ -261,7 +261,7 @@
	}
	envp = psa->envp != NULL ? psa->envp : environ;
	if (psa->use_env_path)
	- execvpe(psa->path, psa->argv, envp);
	+ __libc_execvpe(psa->path, psa->argv, envp);
	else
	_execve(psa->path, psa->argv, envp);
	psa->error = errno;
	diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
	--- a/lib/libc/include/namespace.h
	+++ b/lib/libc/include/namespace.h
	@@ -62,6 +62,7 @@
	#define dup _dup
	#define dup2 _dup2
	#define execve _execve
	+#define execvpe __libc_execvpe
	#define fcntl _fcntl
	/#define flock _flock /
	#define flockfile _flockfile
	diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h
	--- a/lib/libc/include/un-namespace.h
	+++ b/lib/libc/include/un-namespace.h
	@@ -43,6 +43,7 @@
	#undef dup
	#undef dup2
	#undef execve
	+#undef execvpe
	#undef fcntl
	#undef flock
	#undef flockfile