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

diff --git a/fd.c b/fd.c
index 31eb6388..46be2289 100644
--- a/fd.c
+++ b/fd.c
@@ -1,19 +1,22 @@
 /*
- * 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;
@@ -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);
 }
 
 /**
@@ -480,3 +499,65 @@ void valid_fd_012(void)
 		}
 	}
 }
+
+/**
+ * Traverse the given directory recursively.
+ *
+ * \param dirname The directory to traverse.
+ * \param func The function to call for each entry.
+ * \param private_data Pointer to an arbitrary data structure.
+ *
+ * For each regular file under \a dirname, the supplied function \a func is
+ * called.  The full path of the regular file and the \a private_data pointer
+ * are passed to \a func. Directories for which the calling process has no
+ * permissions to change to are silently ignored.
+ *
+ * \return Standard.
+ */
+int for_each_file_in_dir(const char *dirname,
+		int (*func)(const char *, void *), void *private_data)
+{
+	DIR *dir;
+	struct dirent *entry;
+	int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
+
+	if (ret < 0)
+		return ret == -ERRNO_TO_PARA_ERROR(EACCES)? 1 : ret;
+	/* scan cwd recursively */
+	while ((entry = readdir(dir))) {
+		mode_t m;
+		char *tmp;
+		struct stat s;
+
+		if (!strcmp(entry->d_name, "."))
+			continue;
+		if (!strcmp(entry->d_name, ".."))
+			continue;
+		if (lstat(entry->d_name, &s) == -1)
+			continue;
+		m = s.st_mode;
+		if (!S_ISREG(m) && !S_ISDIR(m))
+			continue;
+		tmp = make_message("%s/%s", dirname, entry->d_name);
+		if (!S_ISDIR(m)) {
+			ret = func(tmp, private_data);
+			free(tmp);
+			if (ret < 0)
+				goto out;
+			continue;
+		}
+		/* directory */
+		ret = for_each_file_in_dir(tmp, func, private_data);
+		free(tmp);
+		if (ret < 0)
+			goto out;
+	}
+	ret = 1;
+out:
+	closedir(dir);
+	ret2 = para_fchdir(cwd_fd);
+	if (ret2 < 0 && ret >= 0)
+		ret = ret2;
+	close(cwd_fd);
+	return ret;
+}