puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

environment fixes in run

Browse source 
Move environment related code to a separate function. Create a new char** if ignoreEnvironment is set rather than calling clearEnv
This commit is contained in:
matthew 2019-10-31 20:46:49 -05:00
parent 0ba8a4e942
commit d2438f86d5
1 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
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) const Strings & args, char** env = environ)
{ {
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);
execv(readLink("/proc/self/exe").c_str(), stringsToCharPtrs(helperArgs).data()); execve(readLink("/proc/self/exe").c_str(), stringsToCharPtrs(helperArgs).data(), env);
throw SysError("could not execute chroot helper"); throw SysError("could not execute chroot helper");
} }
execvp(program.c_str(), stringsToCharPtrs(args).data()); execvpe(program.c_str(), stringsToCharPtrs(args).data(), env);
throw SysError("unable to execute '%s'", program); throw SysError("unable to execute '%s'", program);
} }
@ -61,6 +61,7 @@ struct CmdRun : InstallablesCommand, RunCommon
{ {
std::vector<std::string> command = { "bash" }; std::vector<std::string> command = { "bash" };
StringSet keep, unset; StringSet keep, unset;
Strings stringEnv;
bool ignoreEnvironment = false; bool ignoreEnvironment = false;
CmdRun() CmdRun()
@ -126,42 +127,44 @@ struct CmdRun : InstallablesCommand, RunCommon
}; };
} }
char** newEnviron() {
if (ignoreEnvironment) {
if (!unset.empty())
throw UsageError("--unset does not make sense with --ignore-environment");
for (const auto & var : keep) {
auto val = getenv(var.c_str());
if (val) stringEnv.emplace_back(fmt("%s=%s", var.c_str(), val));
}
return stringsToCharPtrs(stringEnv).data();
} else {
if (!keep.empty())
throw UsageError("--keep does not make sense without --ignore-environment");
for (const auto & var : unset)
unsetenv(var.c_str());
return environ;
}
}
void run(ref<Store> store) override void run(ref<Store> store) override
{ {
auto outPaths = toStorePaths(store, Build, installables); auto outPaths = toStorePaths(store, Build, installables);
auto accessor = store->getFSAccessor(); auto accessor = store->getFSAccessor();
if (ignoreEnvironment) {
if (!unset.empty())
throw UsageError("--unset does not make sense with --ignore-environment");
std::map<std::string, std::string> kept;
for (auto & var : keep) {
auto s = getenv(var.c_str());
if (s) kept[var] = s;
}
clearEnv();
for (auto & var : kept)
setenv(var.first.c_str(), var.second.c_str(), 1);
} else {
if (!keep.empty())
throw UsageError("--keep does not make sense without --ignore-environment");
for (auto & var : unset)
unsetenv(var.c_str());
}
std::unordered_set<Path> done; std::unordered_set<Path> done;
std::queue<Path> todo; std::queue<Path> todo;
for (auto & path : outPaths) todo.push(path); for (auto & path : outPaths) todo.push(path);
auto unixPath = tokenizeString<Strings>(getEnv("PATH"), ":"); Strings unixPath;
if (!ignoreEnvironment || keep.find("PATH") != keep.end())
unixPath = tokenizeString<Strings>(getEnv("PATH"), ":");
while (!todo.empty()) { while (!todo.empty()) {
Path path = todo.front(); Path path = todo.front();
@ -179,11 +182,16 @@ 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); runProgram(store, *command.begin(), args, newEnviron());
} }
}; };