X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=86a1f10541f8ca64ffb659d2fc637ea61865e7ff;hp=dc4fd59c93320929bd7e7f781a37f3e903a13c8f;hb=e8d5da94efd6cbb0aa75f57290c76d9992ff8f47;hpb=b59e841036a107b52a0221e48d7e05f86da92979

diff --git a/fd.c b/fd.c
index dc4fd59c..86a1f105 100644
--- a/fd.c
+++ b/fd.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file fd.c Helper functions for file descriptor handling. */
 
@@ -320,9 +316,9 @@ out:
  *
  * \param fn The file name.
  *
- * \return Non-zero iff file exists.
+ * \return True iff file exists.
  */
-int file_exists(const char *fn)
+bool file_exists(const char *fn)
 {
 	struct stat statbuf;
 
@@ -459,22 +455,20 @@ again:
  * 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 map Result pointer.
  *
  * \return Standard.
  *
  * \sa mmap(2).
  */
-int para_mmap(size_t length, int prot, int flags, int fd, off_t offset,
-		void *map)
+int para_mmap(size_t length, int prot, int flags, int fd, void *map)
 {
 	void **m = map;
 
 	errno = EINVAL;
 	if (!length)
 		goto err;
-	*m = mmap(NULL, length, prot, flags, fd, offset);
+	*m = mmap(NULL, length, prot, flags, fd, (off_t)0);
 	if (*m != MAP_FAILED)
 		return 1;
 err:
@@ -573,20 +567,6 @@ close_cwd:
 	return ret;
 }
 
-/**
- * A wrapper for fchdir().
- *
- * \param fd An open file descriptor.
- *
- * \return Standard.
- */
-static int para_fchdir(int fd)
-{
-	if (fchdir(fd) < 0)
-		return -ERRNO_TO_PARA_ERROR(errno);
-	return 1;
-}
-
 /**
  * A wrapper for mkdir(2).
  *
@@ -657,7 +637,7 @@ int mmap_full_file(const char *path, int open_mode, void **map,
 	if (S_ISDIR(file_status.st_mode))
 		goto out;
 
-	ret = para_mmap(*size, mmap_prot, mmap_flags, fd, 0, map);
+	ret = para_mmap(*size, mmap_prot, mmap_flags, fd, map);
 out:
 	if (ret < 0 || !fd_ptr)
 		close(fd);
@@ -749,7 +729,7 @@ int for_each_file_in_dir(const char *dirname,
 {
 	DIR *dir;
 	struct dirent *entry;
-	int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
+	int cwd_fd, ret = para_opendir(dirname, &dir, &cwd_fd);
 
 	if (ret < 0)
 		return ret == -ERRNO_TO_PARA_ERROR(EACCES)? 1 : ret;
@@ -785,9 +765,8 @@ int for_each_file_in_dir(const char *dirname,
 	ret = 1;
 out:
 	closedir(dir);
-	ret2 = para_fchdir(cwd_fd);
-	if (ret2 < 0 && ret >= 0)
-		ret = ret2;
+	if (fchdir(cwd_fd) < 0 && ret >= 0)
+		ret = -ERRNO_TO_PARA_ERROR(errno);
 	close(cwd_fd);
 	return ret;
 }