X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=36b3769d289a03aa0148aa941a713ba1534a2be0;hp=d1e0412d3f3f22174229eab26582b9a688707e85;hb=c839ef92e35d5604748aa4674b400156ff7baced;hpb=9311067b68d9412a02c041873204bcffcb1b9fea

diff --git a/fd.c b/fd.c
index d1e0412d..36b3769d 100644
--- a/fd.c
+++ b/fd.c
@@ -56,11 +56,11 @@ int file_exists(const char *fn)
  * \sa select(2) select_tut(2)
  */
 int para_select(int n, fd_set *readfds, fd_set *writefds,
-		struct timeval *timeout)
+		struct timeval *timeout_tv)
 {
 	int ret, err;
 	do {
-		ret = select(n, readfds, writefds, NULL, timeout);
+		ret = select(n, readfds, writefds, NULL, timeout_tv);
 		err = errno;
 	} while (ret < 0 && err == EINTR);
 	if (ret < 0)
@@ -100,10 +100,20 @@ int mark_fd_nonblock(int fd)
 */
 void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 {
+
 	if (fd < 0 || fd >= FD_SETSIZE) {
 		PARA_EMERG_LOG("fatal: tried to add invalid fd %d\n", fd);
 		exit(EXIT_FAILURE);
 	}
+#if 0
+	{
+		int flags = fcntl(fd, F_GETFL);
+		if (!(flags & O_NONBLOCK)) {
+			PARA_EMERG_LOG("fd %d is a blocking file descriptor\n", fd);
+			exit(EXIT_FAILURE);
+		}
+	}
+#endif
 	FD_SET(fd, fds);
 	*max_fileno = PARA_MAX(*max_fileno, fd);
 }