From: Ian Jackson <ian@liberator.(none)>
Date: Wed, 7 Apr 2010 20:10:34 +0000 (+0100)
Subject: do ignore sigpipe; move inndcommfail
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=663797c732a980c70cb95b41fb9aba24b6714bd5;p=inn-innduct.git

do ignore sigpipe; move inndcommfail
---

diff --git a/backends/innduct.c b/backends/innduct.c
index 33adaf8..c83a02c 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1542,11 +1542,6 @@ static void *statemc_check_oldinput_done(oop_source *lp,
 
 static pid_t inndcomm_child;
 
-static void inndcommfail(const char *what) {
-  syswarn("error communicating with innd: %s failed: %s", what, ICCfailure);
-  exit(INNDCOMMCHILD_ESTATUS_FAIL);
-}
-
 static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
   assert(inndcomm_child);
   int status= xwaitpid(&inndcomm_child, "inndcomm");
@@ -1593,6 +1588,11 @@ static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
   sms= sm_FLUSHFAIL;;
 }
 
+static void inndcommfail(const char *what) {
+  syswarn("error communicating with innd: %s failed: %s", what, ICCfailure);
+  exit(INNDCOMMCHILD_ESTATUS_FAIL);
+}
+
 void spawn_inndcomm_flush(void) {
   int pipefds[2];
 
@@ -1680,7 +1680,8 @@ EVERY(period, {PERIOD_SECONDS,0}, {
 });
 
 main {
-  ignore sigpipe;
+  if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+    sysdie("could not ignore SIGPIPE");
   if (!filemon_init())
     filepoll_schedule();
   period_schedule();