lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

changes

Browse source
This commit is contained in:
matthew 2019-11-04 18:40:25 -06:00
parent d2438f86d5
commit 693e8b1286
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/nix/run.cc
View file

@ -24,7 +24,7 @@ struct RunCommon : virtual Command
{ {
void runProgram(ref<Store> store, void runProgram(ref<Store> store,
const std::string & program, const std::string & program,
const Strings & args, char** env = environ) const Strings & args)
{ {
stopProgressBar(); stopProgressBar();
@ -46,12 +46,12 @@ struct RunCommon : virtual Command
Strings helperArgs = { chrootHelperName, store->storeDir, store2->realStoreDir, program }; Strings helperArgs = { chrootHelperName, store->storeDir, store2->realStoreDir, program };
for (auto & arg : args) helperArgs.push_back(arg); for (auto & arg : args) helperArgs.push_back(arg);
execve(readLink("/proc/self/exe").c_str(), stringsToCharPtrs(helperArgs).data(), env); execv(readLink("/proc/self/exe").c_str(), stringsToCharPtrs(helperArgs).data());
throw SysError("could not execute chroot helper"); throw SysError("could not execute chroot helper");
} }
execvpe(program.c_str(), stringsToCharPtrs(args).data(), env); execvp(program.c_str(), stringsToCharPtrs(args).data());
throw SysError("unable to execute '%s'", program); throw SysError("unable to execute '%s'", program);
} }
@ -127,7 +127,7 @@ struct CmdRun : InstallablesCommand, RunCommon
}; };
} }
char** newEnviron() { void setNewEnviron() {
if (ignoreEnvironment) { if (ignoreEnvironment) {
if (!unset.empty()) if (!unset.empty())
@ -138,7 +138,7 @@ struct CmdRun : InstallablesCommand, RunCommon
if (val) stringEnv.emplace_back(fmt("%s=%s", var.c_str(), val)); if (val) stringEnv.emplace_back(fmt("%s=%s", var.c_str(), val));
} }
return stringsToCharPtrs(stringEnv).data(); environ = stringsToCharPtrs(stringEnv).data();
} else { } else {
if (!keep.empty()) if (!keep.empty())
@ -146,8 +146,6 @@ struct CmdRun : InstallablesCommand, RunCommon
for (const auto & var : unset) for (const auto & var : unset)
unsetenv(var.c_str()); unsetenv(var.c_str());
return environ;
} }
} }
@ -162,9 +160,9 @@ struct CmdRun : InstallablesCommand, RunCommon
std::queue<Path> todo; std::queue<Path> todo;
for (auto & path : outPaths) todo.push(path); for (auto & path : outPaths) todo.push(path);
Strings unixPath; setNewEnviron();
if (!ignoreEnvironment || keep.find("PATH") != keep.end())
unixPath = tokenizeString<Strings>(getEnv("PATH"), ":"); auto unixPath = tokenizeString<Strings>(getEnv("PATH"), ":");
while (!todo.empty()) { while (!todo.empty()) {
Path path = todo.front(); Path path = todo.front();
@ -182,16 +180,11 @@ struct CmdRun : InstallablesCommand, RunCommon
} }
setenv("PATH", concatStringsSep(":", unixPath).c_str(), 1); setenv("PATH", concatStringsSep(":", unixPath).c_str(), 1);
if (ignoreEnvironment) {
keep.emplace("PATH");
} else {
unset.erase("PATH");
}
Strings args; Strings args;
for (auto & arg : command) args.push_back(arg); for (auto & arg : command) args.push_back(arg);
runProgram(store, *command.begin(), args, newEnviron()); runProgram(store, *command.begin(), args);
} }
}; };