projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strndupa() is too arcane for some environments.
[oweals/tinc.git]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index c1dd2d0f3606c25b909093165f39a2580d0ff9eb..9194bedf73cbfd0b8701ee9233078b862c41268f 100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-362,7
+362,8
@@
bool execute_script(const char *name, char **envp)
#ifdef HAVE_SYSTEM
int status, len;
struct stat s;
#ifdef HAVE_SYSTEM
int status, len;
struct stat s;
- char *scriptname;
+ char *scriptname, *p;
+ int i;
cp();
cp();
@@
-386,8
+387,8
@@
bool execute_script(const char *name, char **envp)
#ifdef HAVE_PUTENV
/* Set environment */
#ifdef HAVE_PUTENV
/* Set environment */
-
while(*envp
)
- putenv(
*envp++
);
+
for(i = 0; envp[i]; i++
)
+ putenv(
envp[i]
);
#endif
scriptname[len - 1] = '\"';
#endif
scriptname[len - 1] = '\"';
@@
-395,7
+396,17
@@
bool execute_script(const char *name, char **envp)
free(scriptname);
free(scriptname);
- /* Unset environment? */
+ /* Unset environment */
+
+ for(i = 0; envp[i]; i++) {
+ char *e = strchr(envp[i], '=');
+ if(e) {
+ p = alloca(e - envp[i] + 1);
+ strncpy(p, envp[i], e - envp[i]);
+ p[e - envp[i]] = '\0';
+ putenv(p);
+ }
+ }
#ifdef WEXITSTATUS
if(status != -1) {
#ifdef WEXITSTATUS
if(status != -1) {