Changeset 876

Timestamp:

04/15/08 11:50:27 (7 months ago)

Author:

michux

Message:

add signal handler, improve error check

Files:

• trunk/plugin_fifo.c (modified) (3 diffs)

trunk/plugin_fifo.c

@@ -152 +152 @@
 {
     char buf[FIFO_BUFFER_SIZE];
-    int i, bytes = 1;
+    unsigned int i;
+    int bytes = 1;
     memset(buf, 0, FIFO_BUFFER_SIZE);
     strcat(buf, "ERROR");
+
     if (checkFifo() == 0) {
   memset(buf, 0, FIFO_BUFFER_SIZE);
-  while (bytes > 0 && errno != EINTR) {
+
+  while (bytes > 0 && errno != EINTR) { 
       bytes = read(fd.input, buf, FIFO_BUFFER_SIZE);
   }
   
-  if (bytes < 0) {
+  if (bytes < 0 || errno > 0) {
       error("[FIFO] Error %i: %s", errno, strerror(errno));
   } else {
@@ -173 +176 @@
   }
     } 
-
     /* store result */
     SetResult(&result, R_STRING, msg);
@@ -189 +191 @@
   return -1;
     }
+
+    /* ignore broken pipe */
+    signal(SIGPIPE, SIG_IGN);
+    
     memset(msg, 0, FIFO_BUFFER_SIZE);
     AddFunction("fifo::read", 0, fiforead);