Merge commit 'meins/next' into next

[paraslash.git] / fd.c

diff --git a/fd.c b/fd.c
index c3099f2c7c0ef06162ec25044646290f0e014c1e..3dc490cde1056db92e94108cb7ad3c97131d32d5 100644 (file)
--- a/fd.c
+++ b/fd.c
@@ -6,6 +6,7 @@
 
 /** \file fd.c Helper functions for file descriptor handling. */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/mman.h>
@@ -15,6 +16,7 @@
 #include "para.h"
 #include "error.h"
 #include "string.h"
+
 /**
  * Write a buffer to a file descriptor, re-write on short writes.
  *
@@ -445,18 +447,14 @@ int para_munmap(void *start, size_t length)
 
 int write_ok(int fd)
 {
-       struct timeval tv = {0, 0};
+       struct timeval tv;
        fd_set wfds;
-       int ret;
-again:
+
        FD_ZERO(&wfds);
        FD_SET(fd, &wfds);
        tv.tv_sec = 0;
        tv.tv_usec = 0;
-       ret = select(fd + 1, NULL, &wfds, NULL, &tv);
-       if (ret < 0 && errno == EINTR)
-               goto again;
-       return ret;
+       return para_select(fd + 1, NULL, &wfds, &tv);
 }
 
 /**