X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl.c;h=ab3b8de4683df09c306bcd968ae868f2d978cc8d;hp=fa37dea95ce42faec7131e0b371c837790361c3d;hb=3689799ede7bba230ca544ac953392b428c3d662;hpb=340eefa8e83c72319de0feda257d49e668b33f22

diff --git a/osl.c b/osl.c
index fa37dea9..ab3b8de4 100644
--- a/osl.c
+++ b/osl.c
@@ -5,13 +5,15 @@
  */
 
 /** \file osl.c Object storage layer functions. */
+#include <dirent.h> /* readdir() */
+#include <assert.h>
+
+
 #include "para.h"
 #include "error.h"
+#include "fd.h"
 #include "list.h"
 #include "osl_core.h"
-#include <dirent.h> /* readdir() */
-#include <assert.h>
-
 /**
  * A wrapper for lseek(2).
  *
@@ -93,46 +95,6 @@ ssize_t para_write_all(int fd, const void *buf, size_t size)
 	}
 	return 1;
 }
-/**
- * Wrapper for the open(2) system call.
- *
- * \param path The filename.
- * \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.
- *
- * \return Positive on success, negative on errors. Possible errors: \p
- * E_EXIST, \p E_ISDIR, \p E_NOENT, \p E_OSL_PERM.
- *
- * \sa open(2).
- */
-int para_open(const char *path, int flags, mode_t mode)
-{
-	PARA_DEBUG_LOG("opening %s\n", path);
-	int ret = open(path, flags, 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_OSL_PERM;
-		break;
-	};
-	PARA_ERROR_LOG("failed to open %s: %s\n", path, strerror(errno));
-	return ret;
-}
-
 /**
  * Open a file, write the given buffer and close the file.
  *
@@ -259,26 +221,12 @@ out:
 int for_each_file_in_dir(const char *dirname,
 		int (*func)(const char *, const void *), const void *private_data)
 {
-	DIR *dir = NULL;
+	DIR *dir;
 	struct dirent *entry;
-	/*
-	 * Opening the current directory (".") and calling fchdir() to return
-	 * is usually faster and more reliable than saving cwd in some buffer
-	 * and calling chdir() afterwards (see man 3 getcwd).
-	 */
-	int cwd_fd = open(".", O_RDONLY);
-	int ret = -1;
-
-//	PARA_DEBUG_LOG("dirname: %s\n", dirname);
-	if (cwd_fd < 0)
-		return -E_OSL_GETCWD;
-	ret = -E_OSL_CHDIR;
-	if (chdir(dirname) < 0)
-		goto out;
-	ret = -E_OSL_OPENDIR;
-	dir = opendir(".");
-	if (!dir)
-		goto out;
+	int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
+
+	if (ret < 0)
+		return ret;
 	/* scan cwd recursively */
 	while ((entry = readdir(dir))) {
 		mode_t m;
@@ -310,29 +258,14 @@ int for_each_file_in_dir(const char *dirname,
 	}
 	ret = 1;
 out:
-	if (dir)
-		closedir(dir);
-	if (fchdir(cwd_fd) < 0 && ret >= 0)
-		ret = -E_OSL_CHDIR;
+	closedir(dir);
+	ret2 = para_fchdir(cwd_fd);
+	if (ret2 < 0 && ret >= 0)
+		ret = ret2;
 	close(cwd_fd);
 	return ret;
 }
 
-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_OSL_PERM;
-	return -E_MKDIR;
-}
-
 static int verify_name(const char *name)
 {
 	if (!name)
@@ -651,7 +584,7 @@ static int compare_table_descriptions(struct osl_table *t)
 	ret = -E_BAD_TABLE_FLAGS;
 	if (desc.flags != t->desc->flags)
 		goto out;
-	ret = E_BAD_COLUMN_NUM;
+	ret = -E_BAD_COLUMN_NUM;
 	if (desc.num_columns != t->desc->num_columns)
 		goto out;
 	FOR_EACH_COLUMN(i, t->desc, cd1) {
@@ -819,8 +752,7 @@ static void unmap_column(struct osl_table *t, unsigned col_num)
  * \param t Pointer to a mapped table.
  * \param flags Options for unmapping.
  *
- * \return Positive on success, negative on errors. Possible errors include:
- * E_NOT_MAPPED, E_MUNMAP.
+ * \return Positive on success, negative on errors.
  *
  * \sa map_table(), enum osl_close_flags, para_munmap().
  */