X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=48e2faf97c6d3e2bcb1616ebef04db48e2003d9e;hp=e5aa59f59382967ffd9c54e7c7a4199246bde1f1;hb=63b57e3e60923cea4e3e1808e3133789db2dc83a;hpb=09a864980da1eb9f1df5be566efffdd41154ddbb;ds=sidebyside

diff --git a/fd.c b/fd.c
index e5aa59f5..48e2faf9 100644
--- a/fd.c
+++ b/fd.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file fd.c helper functions for file descriptor handling */
+/** \file fd.c Helper functions for file descriptor handling. */
 
 #include <sys/types.h>
 #include <dirent.h>
@@ -14,10 +14,36 @@
 
 #include "para.h"
 #include "error.h"
+
+/*
+ * Write a buffer to a file descriptor, re-write on short writes.
+ *
+ * \param fd The file descriptor.
+ * \param buf The buffer to be sent.
+ * \param len The length of \a buf.
+ *
+ * \return Standard. In any case, the number of bytes that have been written is
+ * stored in \a len.
+ */
+int write_all(int fd, const char *buf, size_t *len)
+{
+	size_t total = *len;
+
+	assert(total);
+	*len = 0;
+	while (*len < total) {
+		int ret = write(fd, buf + *len, total - *len);
+		if (ret == -1)
+			return -ERRNO_TO_PARA_ERROR(errno);
+		*len += ret;
+	}
+	return 1;
+}
+
 /**
- * check whether a file exists
+ * Check whether a file exists.
  *
- * \param fn the file name
+ * \param fn The file name.
  *
  * \return Non-zero iff file exists.
  */
@@ -29,21 +55,22 @@ int file_exists(const char *fn)
 }
 
 /**
- * paraslash's wrapper for select(2)
+ * Paraslash's wrapper for select(2).
  *
  * It calls select(2) (with no exceptfds) and starts over if select() was
  * interrupted by a signal.
  *
- * \param n the highest-numbered descriptor in any of the two sets, plus 1
- * \param readfds fds that should be checked for readability
- * \param writefds fds that should be checked for writablility
+ * \param n The highest-numbered descriptor in any of the two sets, plus 1.
+ * \param readfds fds that should be checked for readability.
+ * \param writefds fds that should be checked for writablility.
  * \param timeout_tv upper bound on the amount of time elapsed before select()
- * returns
+ * returns.
  *
- * \return The return value of the underlying select() call.
+ * \return The return value of the underlying select() call on success, the
+ * negative system error code on errors.
  *
  * All arguments are passed verbatim to select(2).
- * \sa select(2) select_tut(2)
+ * \sa select(2) select_tut(2).
  */
 int para_select(int n, fd_set *readfds, fd_set *writefds,
 		struct timeval *timeout_tv)
@@ -54,39 +81,57 @@ 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, max_fileno: %d\n",
-			strerror(err), n);
+		return -ERRNO_TO_PARA_ERROR(errno);
 	return ret;
 }
 
 /**
- * set a file descriptor to non-blocking mode
+ * Set a file descriptor to blocking mode.
  *
- * \param fd The file descriptor
+ * \param fd The file descriptor.
  *
- * \returns 1 on success, -E_F_GETFL, -E_F_SETFL, on errors.
+ * \return Standard.
  */
-int mark_fd_nonblock(int fd)
+__must_check int mark_fd_blocking(int fd)
 {
 	int flags = fcntl(fd, F_GETFL);
 	if (flags < 0)
-		return -E_F_GETFL;
-	if (fcntl(fd, F_SETFL, ((long)flags) | O_NONBLOCK) < 0)
-		return -E_F_SETFL;
+		return -ERRNO_TO_PARA_ERROR(errno);
+	flags = fcntl(fd, F_SETFL, ((long)flags) & ~O_NONBLOCK);
+	if (flags < 0)
+		return -ERRNO_TO_PARA_ERROR(errno);
 	return 1;
 }
 
 /**
- * set a file descriptor in a fd_set
+ * Set a file descriptor to non-blocking mode.
  *
- * \param fd the file descriptor to be set
- * \param fds the file descriptor set
- * \param max_fileno highest-numbered file descriptor
+ * \param fd The file descriptor.
+ *
+ * \return Standard.
+ */
+__must_check int mark_fd_nonblocking(int fd)
+{
+	int flags = fcntl(fd, F_GETFL);
+	if (flags < 0)
+		return -ERRNO_TO_PARA_ERROR(errno);
+	flags = fcntl(fd, F_SETFL, ((long)flags) | O_NONBLOCK);
+	if (flags < 0)
+		return -ERRNO_TO_PARA_ERROR(errno);
+	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
+ * \sa para_select.
 */
 void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 {
@@ -109,10 +154,11 @@ void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 }
 
 /**
-* paraslash's wrapper for fgets(3)
-* \param line pointer to the buffer to store the line
-* \param size the size of the buffer given by \a line
-* \param f the stream to read from
+* Paraslash's wrapper for fgets(3).
+
+* \param line Pointer to the buffer to store the line.
+* \param size The size of the buffer given by \a line.
+* \param f The stream to read from.
 *
 * \return Unlike the standard fgets() function, an integer value
 * is returned. On success, this function returns 1. On errors, -E_FGETS
@@ -138,12 +184,12 @@ again:
 /**
  * Paraslash's wrapper for mmap.
  *
- * \param length number of bytes to mmap
- * \param prot either PROT_NONE or the bitwise OR of one or more of
- * PROT_EXEC PROT_READ PROT_WRITE
- * \param flags exactly one of MAP_SHARED and MAP_PRIVATE
- * \param fd the file to mmap from
- * \param offset mmap start
+ * \param length Number of bytes to mmap.
+ * \param prot Either PROT_NONE or the bitwise OR of one or more of
+ * PROT_EXEC PROT_READ PROT_WRITE.
+ * \param flags Exactly one of MAP_SHARED and MAP_PRIVATE.
+ * \param fd The file to mmap from.
+ * \param offset Mmap start.
  *
  * \return This function either returns a valid pointer to the mapped area
  * or calls exit() on errors.
@@ -166,10 +212,10 @@ void *para_mmap(size_t length, int prot, int flags, int fd, off_t offset)
  * \param flags The usual open(2) flags.
  * \param mode Specifies the permissions to use.
  *
- * The mode parameter must be specified when O_CREAT is in the flags, and is ignored
- * otherwise.
+ * The mode parameter must be specified when O_CREAT is in the flags, and is
+ * ignored otherwise.
  *
- * \return Positive on success, negative on errors.
+ * \return The file descriptor on success, negative on errors.
  *
  * \sa open(2).
  */
@@ -179,30 +225,15 @@ int para_open(const char *path, int flags, mode_t mode)
 
 	if (ret >= 0)
 		return ret;
-	switch (errno) {
-	case EEXIST:
-		ret = -E_EXIST;
-		break;
-	case EISDIR:
-		ret = -E_ISDIR;
-		break;
-	case ENOENT:
-		ret = -E_NOENT;
-		break;
-	case EPERM:
-		ret = -E_OPEN_PERM;
-		break;
-	};
-	PARA_ERROR_LOG("failed to open %s: %s\n", path, strerror(errno));
-	return -E_OPEN;
+	return -ERRNO_TO_PARA_ERROR(errno);
 }
 
 /**
  * Wrapper for chdir(2).
  *
- * \param path the specified directory.
+ * \param path The specified directory.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  */
 int para_chdir(const char *path)
 {
@@ -210,13 +241,7 @@ int para_chdir(const char *path)
 
 	if (ret >= 0)
 		return 1;
-	switch (errno) {
-	case ENOENT:
-		return -E_NOENT;
-	case EACCES:
-		return -E_CHDIR_PERM;
-	};
-	return -E_CHDIR;
+	return -ERRNO_TO_PARA_ERROR(errno);
 }
 
 /**
@@ -226,7 +251,7 @@ int para_chdir(const char *path)
  * \param dir Result pointer.
  * \param cwd File descriptor of the current working directory.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  *
  * Opening the current directory (".") and calling fchdir() to return is
  * usually faster and more reliable than saving cwd in some buffer and calling
@@ -256,13 +281,11 @@ int para_opendir(const char *dirname, DIR **dir, int *cwd)
 	ret = para_chdir(dirname);
 	if (ret < 0)
 		goto close_cwd;
-	ret = -E_OPENDIR;
 	*dir = opendir(".");
-	if (!*dir)
-		goto change_to_orig_dir;
-	return 1;
+	if (*dir)
+		return 1;
+	ret = -ERRNO_TO_PARA_ERROR(errno);
 /* Ignore return value of fchdir() and close(). We're busted anyway. */
-change_to_orig_dir:
 	if (cwd)
 		fchdir(*cwd);
 close_cwd:
@@ -274,14 +297,14 @@ close_cwd:
 /**
  * A wrapper for fchdir().
  *
- * \param fd An open file descriptor
+ * \param fd An open file descriptor.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  */
 int para_fchdir(int fd)
 {
 	if (fchdir(fd) < 0)
-		return -E_FCHDIR;
+		return -ERRNO_TO_PARA_ERROR(errno);
 	return 1;
 }
 
@@ -291,19 +314,113 @@ int para_fchdir(int fd)
  * \param path Name of the directory to create.
  * \param mode The permissions to use.
  *
- * \return positive on success, negative on errors.
+ * \return Standard.
  */
 int para_mkdir(const char *path, mode_t mode)
 {
 	if (!mkdir(path, mode))
 		return 1;
-	if (errno == EEXIST)
-		return -E_EXIST;
-	if (errno == ENOSPC)
-		return -E_NOSPC;
-	if (errno == ENOTDIR)
-		return -E_NOTDIR;
-	if (errno == EPERM)
-		return -E_MKDIR_PERM;
-	return -E_MKDIR;
+	return -ERRNO_TO_PARA_ERROR(errno);
+}
+
+/**
+ * Open a file and map it into memory.
+ *
+ * \param path Name of the regular file to map.
+ * \param open_mode Either \p O_RDONLY or \p O_RDWR.
+ * \param map On success, the mapping is returned here.
+ * \param size size of the mapping.
+ * \param fd_ptr The file descriptor of the mapping.
+ *
+ * If \a fd_ptr is \p NULL, the file descriptor resulting from the underlying
+ * open call is closed after mmap().  Otherwise the file is kept open and the
+ * file descriptor is returned in \a fd_ptr.
+ *
+ * \return Standard.
+ *
+ * \sa para_open(), mmap(2).
+ */
+int mmap_full_file(const char *path, int open_mode, void **map,
+		size_t *size, int *fd_ptr)
+{
+	int fd, ret, mmap_prot, mmap_flags;
+	struct stat file_status;
+
+	if (open_mode == O_RDONLY) {
+		mmap_prot = PROT_READ;
+		mmap_flags = MAP_PRIVATE;
+	} else {
+		mmap_prot = PROT_READ | PROT_WRITE;
+		mmap_flags = MAP_SHARED;
+	}
+	ret = para_open(path, open_mode, 0);
+	if (ret < 0)
+		return ret;
+	fd = ret;
+	if (fstat(fd, &file_status) < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		goto out;
+	}
+	*size = file_status.st_size;
+	ret = -E_EMPTY;
+	PARA_DEBUG_LOG("%s: size %zu\n", path, *size);
+	if (!*size)
+		goto out;
+	*map = mmap(NULL, *size, mmap_prot, mmap_flags, fd, 0);
+	if (*map == MAP_FAILED) {
+		*map = NULL;
+		ret = -E_MMAP;
+		goto out;
+	}
+	ret = 1;
+out:
+	if (ret < 0 || !fd_ptr)
+		close(fd);
+	else
+		*fd_ptr = fd;
+	return ret;
+}
+
+/**
+ * A wrapper for munmap(2).
+ *
+ * \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.
+ *
+ * \sa munmap(2), mmap_full_file().
+ */
+int para_munmap(void *start, size_t length)
+{
+	if (munmap(start, length) >= 0)
+		return 1;
+	PARA_ERROR_LOG("munmap (%p/%zu) failed: %s\n", start, length,
+		strerror(errno));
+	return -E_MUNMAP;
+}
+
+/**
+ * check a file descriptor for writability
+ *
+ * \param fd the file descriptor
+ *
+ * \return positive if fd is ready for writing, zero if it isn't, negative if
+ * an error occurred.
+ */
+
+int write_ok(int fd)
+{
+	struct timeval tv = {0, 0};
+	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;
 }