X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=46be22891e93f2f094f3118daef5780c067b4cea;hp=1c67f22bb284ab11ffda80bb90c0693661b0328c;hb=45b4e8b0ba410fd929a341a9bf84b1ac3995d734;hpb=b2e6a24448a9e49e0766ab4f32163580eeff469e

diff --git a/fd.c b/fd.c
index 1c67f22b..46be2289 100644
--- a/fd.c
+++ b/fd.c
@@ -1,20 +1,23 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file fd.c Helper functions for file descriptor handling. */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <sys/select.h>
+#include <sys/uio.h>
 
 #include "para.h"
 #include "error.h"
 #include "string.h"
+
 /**
  * Write a buffer to a file descriptor, re-write on short writes.
  *
@@ -79,6 +82,27 @@ int write_nonblock(int fd, const char *buf, size_t len,
 	return written;
 }
 
+/**
+ * Simple wrapper for readv().
+ *
+ * \param fd The file descriptor to read from.
+ * \param iov Scatter/gather array used in readv().
+ * \param iovcnt Number of elements in \a iov.
+ *
+ * \return A negative error code on errors, the return value of the underlying
+ * call to readv() otherwise.
+ *
+ * \sa readv(2).
+ */
+int para_readv(int fd, struct iovec *iov, int iovcnt)
+{
+	int ret = readv(fd, iov, iovcnt);
+
+	if (ret < 0)
+		return -ERRNO_TO_PARA_ERROR(errno);
+	return ret;
+}
+
 /**
  * Check whether a file exists.
  *
@@ -114,11 +138,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;
@@ -420,7 +443,7 @@ out:
  * \param start The start address of the memory mapping.
  * \param length The size of the mapping.
  *
- * \return Positive on success, \p -E_MUNMAP on errors.
+ * \return Standard.
  *
  * \sa munmap(2), mmap_full_file().
  */
@@ -446,18 +469,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);
 }
 
 /**