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

Restore default SIGPIPE handler before invoking ‘man’

Browse source 
Fixes NixOS/nixpkgs#3410.
This commit is contained in:
Eelco Dolstra 2014-07-31 10:31:17 +02:00
parent 45f9a91e18
commit 50dc1f5b71
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libmain/shared.cc
View file

@ -244,9 +244,9 @@ static void initAndRun(int argc, char * * argv)
void showManPage(const string & name) void showManPage(const string & name)
{ {
string cmd = "man " + name; restoreSIGPIPE();
if (system(cmd.c_str()) != 0) execlp("man", "man", name.c_str(), NULL);
throw Error(format("command `%1%' failed") % cmd); throw SysError(format("command `man %1%' failed") % name.c_str());
} }

12
src/libstore/build.cc
View file

@ -413,18 +413,6 @@ const char * * strings2CharPtrs(const Strings & ss)
} }
/* Restore default handling of SIGPIPE, otherwise some programs will
randomly say "Broken pipe". */
static void restoreSIGPIPE()
{
struct sigaction act, oact;
act.sa_handler = SIG_DFL;
act.sa_flags = 0;
sigemptyset(&act.sa_mask);
if (sigaction(SIGPIPE, &act, &oact)) throw SysError("resetting SIGPIPE");
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

10
src/libutil/util.cc
View file

@ -927,6 +927,16 @@ void closeOnExec(int fd)
} }
void restoreSIGPIPE()
{
struct sigaction act, oact;
act.sa_handler = SIG_DFL;
act.sa_flags = 0;
sigemptyset(&act.sa_mask);
if (sigaction(SIGPIPE, &act, &oact)) throw SysError("resetting SIGPIPE");
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

4
src/libutil/util.hh
View file

@ -273,6 +273,10 @@ void closeMostFDs(const set<int> & exceptions);
/* Set the close-on-exec flag for the given file descriptor. */ /* Set the close-on-exec flag for the given file descriptor. */
void closeOnExec(int fd); void closeOnExec(int fd);
/* Restore default handling of SIGPIPE, otherwise some programs will
randomly say "Broken pipe". */
void restoreSIGPIPE();
/* User interruption. */ /* User interruption. */