Patchwork uClibc: add execvpe() function

login
register
mail settings
Submitter Stefan Fröberg
Date March 9, 2013, 5:16 p.m.
Message ID <1362849379-32035-1-git-send-email-stefan.froberg@petroprogram.com>
Download mbox | patch
Permalink /patch/226347/
State Superseded
Headers show

Comments

Stefan Fröberg - March 9, 2013, 5:16 p.m.
add execvpe() function to uClibc 0.9.33.2

URL:	http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/uclibc-execvpe.patch

Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
---
 ....9.33.2-add-non-standard-execvpe-function.patch |  163 ++++++++++++++++++++
 1 files changed, 163 insertions(+), 0 deletions(-)
 create mode 100755 toolchain/uClibc/uClibc-0.9.33.2-add-non-standard-execvpe-function.patch
Arnout Vandecappelle - March 11, 2013, 5:52 p.m.
On 03/09/13 18:16, Stefan Fröberg wrote:
> add execvpe() function to uClibc 0.9.33.2

  Perhaps you could explain why this is needed? Is it also for udev?


  Regards,
  Arnout
Stefan Fröberg - March 11, 2013, 10:01 p.m.
11.3.2013 19:52, Arnout Vandecappelle kirjoitti:
> On 03/09/13 18:16, Stefan Fröberg wrote:
>> add execvpe() function to uClibc 0.9.33.2
>
>  Perhaps you could explain why this is needed? Is it also for udev?
>
>
>  Regards,
>  Arnout
>

Kinda.
It's a support patch for that systemd 197 patch made by Olivier Schonken.

Regards
Stefan
Gustavo Zacarias - March 24, 2013, 6:50 p.m.
On 03/09/2013 02:16 PM, Stefan Fröberg wrote:

> add execvpe() function to uClibc 0.9.33.2
> 
> URL:	http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/uclibc-execvpe.patch
> 
> Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>

Care to resend this one and mkostemp adding a patch for uClibc-0.9.32.1
too? (same ones do fine, i've build-tested it).
Thanks.

Patch

diff --git a/toolchain/uClibc/uClibc-0.9.33.2-add-non-standard-execvpe-function.patch b/toolchain/uClibc/uClibc-0.9.33.2-add-non-standard-execvpe-function.patch
new file mode 100755
index 0000000..fe191fc
--- /dev/null
+++ b/toolchain/uClibc/uClibc-0.9.33.2-add-non-standard-execvpe-function.patch
@@ -0,0 +1,163 @@ 
+From d20556adadea03bff0bba051172caf0314a35471 Mon Sep 17 00:00:00 2001
+From: Henning Heinold <heinold@inf.fu-berlin.de>
+Date: Sat, 4 Jun 2011 21:23:15 +0200
+Subject: [PATCH 2/2] libc: add non standard execvpe function
+
+
+Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
+---
+ include/unistd.h      |    6 ++++++
+ libc/unistd/exec.c    |   38 +++++++++++++++++++++++++++++++++-----
+ libc/unistd/execvpe.c |    7 +++++++
+ 3 files changed, 46 insertions(+), 5 deletions(-)
+ create mode 100644 libc/unistd/execvpe.c
+
+
+Upstream-Status: Pending
+
+diff --git a/include/unistd.h b/include/unistd.h
+index 9568790..070e4f2 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -557,6 +557,12 @@ extern int execvp (__const char *__file, char *__const __argv[])
+      __THROW __nonnull ((1));
+ libc_hidden_proto(execvp)
+ 
++/* Execute FILE, searching in the `PATH' environment variable if it contains
++   no slashes, with arguments ARGV and environment from a pointer */
++extern int execvpe (__const char *__file, char *__const __argv[], char *__const __envp[])
++     __THROW __nonnull ((1));
++libc_hidden_proto(execvpe)
++
+ /* Execute FILE, searching in the `PATH' environment variable if
+    it contains no slashes, with all arguments after FILE until a
+    NULL pointer and environment from `environ'.  */
+diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c
+index 7d24072..802a174 100644
+--- a/libc/unistd/exec.c
++++ b/libc/unistd/exec.c
+@@ -32,6 +32,8 @@
+ /**********************************************************************/
+ #define EXEC_FUNC_COMMON 0
+ #define EXEC_FUNC_EXECVP 1
++#define EXEC_FUNC_EXECVPE 2
++
+ #if defined(__ARCH_USE_MMU__)
+ 
+ /* We have an MMU, so use alloca() to grab space for buffers and arg lists. */
+@@ -58,6 +60,7 @@
+  *  execle(a) -> execve(-)
+  *  execv(-)  -> execve(-)
+  *  execvp(a) -> execve(-)
++ *  execvpe(a) -> execve(-)
+  */
+ 
+ # define EXEC_ALLOC_SIZE(VAR)      /* nothing to do */
+@@ -219,15 +222,18 @@ libc_hidden_def(execlp)
+ 
+ #endif
+ /**********************************************************************/
+-#ifdef L_execvp
++#if defined (L_execvp) || defined(L_execvpe)
+ 
+ 
+ /* Use a default path that matches glibc behavior, since SUSv3 says
+  * this is implementation-defined.  The default is current working dir,
+  * /bin, and then /usr/bin. */
+ static const char default_path[] = ":/bin:/usr/bin";
+-
++#if defined (L_execvp)
+ int execvp(const char *path, char *const argv[])
++#elif defined (L_execvpe)
++int execvpe(const char *path, char *const argv[], char *const envp[])
++#endif
+ {
+ 	char *buf = NULL;
+ 	char *p;
+@@ -245,7 +251,11 @@ int execvp(const char *path, char *const argv[])
+ 	}
+ 
+ 	if (strchr(path, '/')) {
++#if defined (L_execvp)
+ 		execve(path, argv, __environ);
++#elif defined (L_execvpe)
++		execve(path, argv, envp);
++#endif
+ 		if (errno == ENOEXEC) {
+ 			char **nargv;
+ 			EXEC_ALLOC_SIZE(size2) /* Do NOT add a semicolon! */
+@@ -254,11 +264,19 @@ int execvp(const char *path, char *const argv[])
+ 			/* Need the dimension - 1.  We omit counting the trailing
+ 			 * NULL but we actually omit the first entry. */
+ 			for (n=0 ; argv[n] ; n++) {}
++#if defined (L_execvp)
+ 			nargv = (char **) EXEC_ALLOC((n+2) * sizeof(char *), size2, EXEC_FUNC_EXECVP);
++#elif defined (L_execvpe)
++			nargv = (char **) EXEC_ALLOC((n+2) * sizeof(char *), size2, EXEC_FUNC_EXECVPE);
++#endif
+ 			nargv[0] = argv[0];
+ 			nargv[1] = (char *)path;
+ 			memcpy(nargv+2, argv+1, n*sizeof(char *));
++#if defined (L_execvp)
+ 			execve("/bin/sh", nargv, __environ);
++#elif defined (L_execvpe)
++			execve("/bin/sh", nargv, envp);
++#endif
+ 			EXEC_FREE(nargv, size2);
+ 		}
+ 	} else {
+@@ -277,8 +295,11 @@ int execvp(const char *path, char *const argv[])
+ 			return -1;
+ 		}
+ 		len = (FILENAME_MAX - 1) - plen;
+-
++#if defined (L_execvp)
+ 		buf = EXEC_ALLOC(FILENAME_MAX, size, EXEC_FUNC_EXECVP);
++#elif defined (L_execvpe)
++		buf = EXEC_ALLOC(FILENAME_MAX, size, EXEC_FUNC_EXECVPE);
++#endif
+ 		{
+ 			int seen_small = 0;
+ 			s0 = buf + len;
+@@ -300,8 +321,11 @@ int execvp(const char *path, char *const argv[])
+ 					s[plen-1] = '/';
+ 				}
+ 
++#if defined (L_execvp)
+ 				execve(s, argv, __environ);
+-
++#elif defined (L_execvpe)
++				execve(s, argv, envp);
++#endif
+ 				seen_small = 1;
+ 
+ 				if (errno == ENOEXEC) {
+@@ -325,7 +349,11 @@ int execvp(const char *path, char *const argv[])
+ 
+ 	return -1;
+ }
++#if defined (L_execvp)
+ libc_hidden_def(execvp)
+-
++#elif defined (L_execvpe)
++libc_hidden_def(execvpe)
+ #endif
++
++#endif /* #if defined (L_execvp) || defined(L_execvpe) */
+ /**********************************************************************/
+diff --git a/libc/unistd/execvpe.c b/libc/unistd/execvpe.c
+new file mode 100644
+index 0000000..5c1ce06
+--- /dev/null
++++ b/libc/unistd/execvpe.c
+@@ -0,0 +1,7 @@
++/* Copyright (C) 2011      Hennning Heinold <heinold@inf.fu-berlin.de>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#define L_execvpe
++#include "exec.c"
+-- 
+1.7.5.3
+