X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=0adab0f2c0732862f03201119f975873211b5c38;hp=f9b3d9d003abe88599f437bcc1aa46424bc99dc8;hb=8d7f47e8cec74e4d209cfa1f6c4c0cec3b0e5019;hpb=61250cf03241bf73662dac3753e44660a572fa2a

diff --git a/fd.c b/fd.c
index f9b3d9d0..0adab0f2 100644
--- a/fd.c
+++ b/fd.c
@@ -60,6 +60,24 @@ int para_select(int n, fd_set *readfds, fd_set *writefds,
 	return ret;
 }
 
+/**
+ * Set a file descriptor to blocking mode.
+ *
+ * \param fd The file descriptor.
+ *
+ * \return Standard.
+ */
+int mark_fd_blocking(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 to non-blocking mode.
  *
@@ -67,7 +85,7 @@ int para_select(int n, fd_set *readfds, fd_set *writefds,
  *
  * \return Standard.
  */
-int mark_fd_nonblock(int fd)
+int mark_fd_nonblocking(int fd)
 {
 	int flags = fcntl(fd, F_GETFL);
 	if (flags < 0)
@@ -281,11 +299,17 @@ int para_mkdir(const char *path, mode_t mode)
 }
 
 /**
- * Map a file into memory.
+ * 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 obj On success, the mapping is returned here.
+ * \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 Positive on success, negative on errors. Possible errors include: \p
  * E_FSTAT, any errors returned by para_open(), \p E_EMPTY, \p E_MMAP.