wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

Remove some redundant close() calls

Browse source 
They are unnecessary because we set the close-on-exec flag.
This commit is contained in:
Eelco Dolstra 2012-11-09 16:58:51 +01:00
parent 10dcee99ed
commit 198dbe7fa1
3 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libutil/util.cc
View file

@ -870,7 +870,13 @@ void killUser(uid_t uid)
string runProgram(Path program, bool searchPath, const Strings & args)
{
checkInterrupt();
std::vector<const char *> cargs; /* careful with c_str()! */
cargs.push_back(program.c_str());
for (Strings::const_iterator i = args.begin(); i != args.end(); ++i)
cargs.push_back(i->c_str());
cargs.push_back(0);
/* Create a pipe. */
Pipe pipe;
pipe.create();
@ -885,23 +891,15 @@ string runProgram(Path program, bool searchPath, const Strings & args)
case 0: /* child */
try {
pipe.readSide.close();
if (dup2(pipe.writeSide, STDOUT_FILENO) == -1)
throw SysError("dupping stdout");
std::vector<const char *> cargs; /* careful with c_str()! */
cargs.push_back(program.c_str());
for (Strings::const_iterator i = args.begin(); i != args.end(); ++i)
cargs.push_back(i->c_str());
cargs.push_back(0);
if (searchPath)
execvp(program.c_str(), (char * *) &cargs[0]);
else
execv(program.c_str(), (char * *) &cargs[0]);
throw SysError(format("executing `%1%'") % program);
} catch (std::exception & e) {
std::cerr << "error: " << e.what() << std::endl;
}