X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=3dc490cde1056db92e94108cb7ad3c97131d32d5;hp=1c67f22bb284ab11ffda80bb90c0693661b0328c;hb=7cd6e84f08240d3604ddb36ecd3c7b1ec6990446;hpb=03d45daad787b8f2ced3070e80c4550bf4b02931

diff --git a/fd.c b/fd.c
index 1c67f22b..3dc490cd 100644
--- 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.
  *
@@ -114,11 +116,10 @@ int file_exists(const char *fn)
 int para_select(int n, fd_set *readfds, fd_set *writefds,
 		struct timeval *timeout_tv)
 {
-	int ret, err;
-	do {
+	int ret;
+	do
 		ret = select(n, readfds, writefds, NULL, timeout_tv);
-		err = errno;
-	} while (ret < 0 && err == EINTR);
+	while (ret < 0 && errno == EINTR);
 	if (ret < 0)
 		return -ERRNO_TO_PARA_ERROR(errno);
 	return ret;
@@ -446,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);
 }
 
 /**