X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/9d23d98214827786cccd9699c87327f93f855778..75263f25a1ce8e7b38ad4bd61a9a893723ec1db3:/pixie.c

diff --git a/pixie.c b/pixie.c
index ecbab8f..a1d1e2a 100644
--- a/pixie.c
+++ b/pixie.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: pixie.c,v 1.8 2001/01/25 22:19:31 mdw Exp $
+ * $Id: pixie.c,v 1.12 2002/01/13 13:50:42 mdw Exp $
  *
  * Passphrase pixie for Catacomb
  *
@@ -30,6 +30,19 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: pixie.c,v $
+ * Revision 1.12  2002/01/13 13:50:42  mdw
+ * Various fixes tracking mLib changes.
+ *
+ * Revision 1.11  2002/01/13 13:43:05  mdw
+ * Fix bug in daemon mode.
+ *
+ * Revision 1.10  2001/02/21 20:03:54  mdw
+ * Handle select errors (by bombing out).  Cosmetic tweak.
+ *
+ * Revision 1.9  2001/02/03 16:06:44  mdw
+ * Don't set a handler for @SIGINT@ if it's ignored at startup.  Add some
+ * error handling for the @select@ loop.
+ *
  * Revision 1.8  2001/01/25 22:19:31  mdw
  * Make flags be unsigned.
  *
@@ -162,7 +175,7 @@ static void log(const char *p, ...)
     d.len += strftime(d.buf, d.sz, "%Y-%m-%d %H:%M:%S ", tm);
   }
   va_start(ap, p);
-  dstr_vputf(&d, p, ap);
+  dstr_vputf(&d, p, &ap);
   va_end(ap);
 
   if (flags & F_SYSLOG)
@@ -648,7 +661,7 @@ static void pixserv_write(pixserv *px, const char *p, ...)
   va_list ap;
 
   va_start(ap, p);
-  dstr_vputf(&d, p, ap);
+  dstr_vputf(&d, p, &ap);
   write(px->fd, d.buf, d.len);
   va_end(ap);
   dstr_destroy(&d);
@@ -686,6 +699,7 @@ static unsigned long pixserv_timeout(const char *p)
 /* --- @pixserv_line@ --- *
  *
  * Arguments:	@char *s@ = pointer to the line read
+ *		@size_t len@ = length of the line
  *		@void *p@ = pointer to server block
  *
  * Returns:	---
@@ -693,7 +707,7 @@ static unsigned long pixserv_timeout(const char *p)
  * Use:		Handles a line read from the client.
  */
 
-static void pixserv_line(char *s, void *p)
+static void pixserv_line(char *s, size_t len, void *p)
 {
   pixserv *px = p;
   char *q, *qq;
@@ -1077,21 +1091,19 @@ static unsigned c_flags = 0;
 
 /* --- Line handler functions --- */
 
-static void c_uline(char *s, void *p)
+static void c_uline(char *s, size_t len, void *p)
 {
-  size_t sz;
   if (!s) {
     selbuf_destroy(&c_client);
     shutdown(c_server.reader.fd, 1);
     c_flags |= cf_uclose;
   } else {
-    sz = strlen(s);
-    s[sz++] = '\n';
-    write(c_server.reader.fd, s, sz);
+    s[len++] = '\n';
+    write(c_server.reader.fd, s, len);
   }
 }
 
-static void c_sline(char *s, void *p)
+static void c_sline(char *s, size_t len, void *p)
 {
   if (!s) {
     selbuf_destroy(&c_server);
@@ -1100,8 +1112,8 @@ static void c_sline(char *s, void *p)
       selbuf_destroy(&c_client);
     }
     exit(0);
-  } else 
-    puts(s);
+  }
+  puts(s);
 }
 
 /* --- @pix_client@ --- *
@@ -1151,8 +1163,10 @@ static void pix_client(struct sockaddr_un *sun, size_t sz, char *argv[])
 
   /* --- And repeat --- */
 
-  for (;;)
-    sel_select(&sel);
+  for (;;) {
+    if (sel_select(&sel))
+      die(EXIT_FAILURE, "select error: %s", strerror(errno));
+  }
 }
 
 /*----- Main code ---------------------------------------------------------*/
@@ -1389,8 +1403,11 @@ int main(int argc, char *argv[])
 
   {
     static sig sigint, sigterm, sigquit, sighup;
+    struct sigaction sa;
     sig_init(&sel);
-    sig_add(&sigint, SIGINT, pix_sigdie, 0);
+    sigaction(SIGINT, 0, &sa);
+    if (sa.sa_handler != SIG_IGN)
+      sig_add(&sigint, SIGINT, pix_sigdie, 0);
     sig_add(&sigterm, SIGTERM, pix_sigdie, 0);
     sig_add(&sigquit, SIGQUIT, pix_sigflush, 0);
     sig_add(&sighup, SIGHUP, pix_sigflush, 0);
@@ -1431,14 +1448,28 @@ int main(int argc, char *argv[])
     chdir("/");
     setsid();
 
-    if (fork() > 0)
+    if (fork() != 0)
       _exit(0);
   }
 
   if (verbose)
     log("initialized ok");
-  for (;;)
-    sel_select(&sel);
+
+  {
+    int selerr = 0;
+    for (;;) {
+      if (!sel_select(&sel))
+	selerr = 0;
+      else if (errno != EINTR && errno != EAGAIN) {
+	log("error from select: %s", strerror(errno));
+	selerr++;
+	if (selerr > 8) {
+	  log("too many consecutive select errors: bailing out");
+	  exit(EXIT_FAILURE);
+	}
+      }
+    }
+  }
   return (0);
 }