X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=d1e0412d3f3f22174229eab26582b9a688707e85;hp=81ba5cffb7e6919ec7eca5d4fdfd9d0aecc92f61;hb=d7f72444e863fb5aae145d4e720cd71dc03578b0;hpb=83632cf4e091d02defa4646eaeb38e5decab52f1

diff --git a/fd.c b/fd.c
index 81ba5cff..d1e0412d 100644
--- a/fd.c
+++ b/fd.c
@@ -19,6 +19,10 @@
 /** \file fd.c helper functions for file descriptor handling */
 
 #include "para.h"
+
+#include <fcntl.h>
+#include <sys/select.h>
+
 #include "error.h"
 /**
  * check whether a file exists
@@ -60,7 +64,8 @@ int para_select(int n, fd_set *readfds, fd_set *writefds,
 		err = errno;
 	} while (ret < 0 && err == EINTR);
 	if (ret < 0)
-		PARA_CRIT_LOG("select error (%s)\n", strerror(err));
+		PARA_CRIT_LOG("select error: %s, max_fileno: %d\n",
+			strerror(err), n);
 	return ret;
 }
 
@@ -81,3 +86,47 @@ int mark_fd_nonblock(int fd)
 	return 1;
 }
 
+/**
+ * set a file descriptor in a fd_set
+ *
+ * \param fd the file descriptor to be set
+ * \param fds the file descriptor set
+ * \param max_fileno highest-numbered file descriptor
+ *
+ * This wrapper for FD_SET() passes its first two arguments to \p FD_SET. Upon
+ * return, \a max_fileno contains the maximum of the old_value and \a fd.
+ *
+ * \sa para_select
+*/
+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);
+	}
+	FD_SET(fd, fds);
+	*max_fileno = PARA_MAX(*max_fileno, fd);
+}
+
+/**
+ * paraslash's wrapper for fread(3)
+ *
+ * \param dest destination pointer
+ * \param nbytes size of one element
+ * \param nmemb number of elements to write
+ * \param stream the input stream
+ *
+ * \return negative on errors, zero on end of file, and the number of bytes
+ * (not elements) read on success.
+ *
+ * \sa fread(3)
+ */
+__must_check int para_fread(void *dest, size_t nbytes, size_t nmemb, FILE *stream)
+{
+	size_t res = fread(dest, nbytes, nmemb, stream);
+	if (res == nmemb)
+		return nbytes * nmemb;
+	if (feof(stream))
+		return 0;
+	return -E_FREAD;
+}