maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-25 19:10:47 +02:00
parent 4c95ef3768
commit 23aa1619da
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/nix/repl.cc
View file

@ -289,18 +289,15 @@ void NixRepl::completePrefix(string prefix)
static int runProgram(const string & program, const Strings & args) static int runProgram(const string & program, const Strings & args)
{ {
std::vector<const char *> cargs; /* careful with c_str()! */ Strings args2(args);
cargs.push_back(program.c_str()); args2.push_front(program);
for (Strings::const_iterator i = args.begin(); i != args.end(); ++i)
cargs.push_back(i->c_str());
cargs.push_back(0);
Pid pid; Pid pid;
pid = fork(); pid = fork();
if (pid == -1) throw SysError("forking"); if (pid == -1) throw SysError("forking");
if (pid == 0) { if (pid == 0) {
restoreAffinity(); restoreAffinity();
execvp(program.c_str(), (char * *) &cargs[0]); execvp(program.c_str(), stringsToCharPtrs(args2).data());
_exit(1); _exit(1);
} }
@ -394,7 +391,7 @@ bool NixRepl::processLine(string line)
state.callFunction(f, v, result, Pos()); state.callFunction(f, v, result, Pos());
Path drvPath = getDerivationPath(result); Path drvPath = getDerivationPath(result);
runProgram("nix-shell", Strings{drvPath}); runProgram(settings.nixBinDir + "/nix-shell", Strings{drvPath});
} }
else if (command == ":b" || command == ":i" || command == ":s") { else if (command == ":b" || command == ":i" || command == ":s") {
@ -406,16 +403,16 @@ bool NixRepl::processLine(string line)
/* We could do the build in this process using buildPaths(), /* We could do the build in this process using buildPaths(),
but doing it in a child makes it easier to recover from but doing it in a child makes it easier to recover from
problems / SIGINT. */ problems / SIGINT. */
if (runProgram("nix-store", Strings{"-r", drvPath}) == 0) { if (runProgram(settings.nixBinDir + "/nix-store", Strings{"-r", drvPath}) == 0) {
Derivation drv = readDerivation(drvPath); Derivation drv = readDerivation(drvPath);
std::cout << std::endl << "this derivation produced the following outputs:" << std::endl; std::cout << std::endl << "this derivation produced the following outputs:" << std::endl;
for (auto & i : drv.outputs) for (auto & i : drv.outputs)
std::cout << format(" %1% -> %2%") % i.first % i.second.path << std::endl; std::cout << format(" %1% -> %2%") % i.first % i.second.path << std::endl;
} }
} else if (command == ":i") { } else if (command == ":i") {
runProgram("nix-env", Strings{"-i", drvPath}); runProgram(settings.nixBinDir + "/nix-env", Strings{"-i", drvPath});
} else { } else {
runProgram("nix-shell", Strings{drvPath}); runProgram(settings.nixBinDir + "/nix-shell", Strings{drvPath});
} }
} }