Skip to content

Commit e950313

Browse files
committed
Remove execvpe use in general, it seems pointless and non-portable.
1 parent 635b551 commit e950313

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/rt/rust_run_program.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,19 +163,15 @@ rust_run_program(const char* argv[],
163163
assert(!result && "chdir failed");
164164
}
165165

166-
#ifdef __APPLE__
167166
if (envp) {
167+
#ifdef __APPLE__
168168
*_NSGetEnviron() = (char **)envp;
169-
}
170-
execvp(argv[0], (char * const *)argv);
171-
#elif __FreeBSD__ || (defined(__linux__) && defined(RUST_SNAPSHOT))
172-
if (envp) { environ = (char **)envp; }
173-
execvp(argv[0], (char * const *)argv);
174169
#else
175-
if (!envp) { envp = environ; }
176-
execvpe(argv[0], (char * const *)argv, (char * const *)envp);
170+
environ = (char **)envp;
177171
#endif
172+
}
178173

174+
execvp(argv[0], (char * const *)argv);
179175
exit(1);
180176
}
181177

0 commit comments

Comments
 (0)