X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=fsck.c;h=bd1b5567ba86c05d2f168ecf9506c8dcda7ab5f7;hp=55c134aaa87b40bca139d5cbb32bf3e022f54353;hb=aaedc06d0448b048c7d41074985f9ee81e93d077;hpb=af89ce791ead29cb2a86e257f8e8d113c6ac205f

diff --git a/fsck.c b/fsck.c
index 55c134a..bd1b556 100644
--- a/fsck.c
+++ b/fsck.c
@@ -14,8 +14,7 @@
 
 #include "log.h"
 #include "osl.h"
-#include "error.h"
-#include "fd.h"
+#include "util.h"
 #include "osl_core.h"
 #include "fsck.cmdline.h"
 
@@ -39,8 +38,12 @@ static struct fsck_args_info conf;
 #define FSCK_ERRORS \
 	FSCK_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \
 	FSCK_ERROR(NOT_A_REGULAR_FILE, "not a regular file"), \
-	FSCK_ERROR(SYNTAX, "fsck syntax error"),
+	FSCK_ERROR(SYNTAX, "fsck syntax error"), \
+	FSCK_ERROR(ACCESS, "permission denied"), \
+	FSCK_ERROR(CHDIR, "could not change directory"), \
+	FSCK_ERROR(OPENDIR, "could not open directory"),
 
+#define FSCK_ERROR_BIT 29
 #define FSCK_ERROR(num, txt) E_FSCK_ ## num
 enum {
 	FSCK_DUMMY = (1 << FSCK_ERROR_BIT) - 1,
@@ -208,6 +211,86 @@ static int uint32_compare(const struct osl_object *obj1, const struct osl_object
 	return 0;
 }
 
+/**
+ * A wrapper for fchdir().
+ *
+ * \param fd An open file descriptor.
+ *
+ * \return Standard.
+ */
+static inline int __fchdir(int fd)
+{
+	if (fchdir(fd) >= 0)
+		return 1;
+	return errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_CHDIR;
+}
+
+/**
+ * Wrapper for chdir(2).
+ *
+ * \param path The specified directory.
+ *
+ * \return Standard.
+ */
+_static_inline_ int __chdir(const char *path)
+{
+	if (chdir(path) >= 0)
+		return 1;
+	return errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_CHDIR;
+}
+
+/**
+ * Save the cwd and open a given directory.
+ *
+ * \param dirname Path to the directory to open.
+ * \param dir Result pointer.
+ * \param cwd File descriptor of the current working directory.
+ *
+ * \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
+ * chdir() afterwards.
+ *
+ * If \a cwd is not \p NULL "." is opened and the resulting file descriptor is
+ * stored in \a cwd. If the function returns success, and \a cwd is not \p
+ * NULL, the caller must close this file descriptor (probably after calling
+ * fchdir(*cwd)).
+ *
+ * On errors, the function undos everything, so the caller needs neither close
+ * any files, nor change back to the original working directory.
+ *
+ * \sa getcwd(3).
+ *
+ */
+static int fsck_opendir(const char *dirname, DIR **dir, int *cwd)
+{
+	int ret;
+
+	if (cwd) {
+		ret = osl_open(".", O_RDONLY, 0);
+		if (ret < 0)
+			return ret;
+		*cwd = ret;
+	}
+	ret = __chdir(dirname);
+	if (ret < 0)
+		goto close_cwd;
+	*dir = opendir(".");
+	if (*dir)
+		return 1;
+	ret = errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_OPENDIR;
+/* Ignore return value of fchdir() and close(). We're busted anyway. */
+	if (cwd)
+		fchdir(*cwd);
+close_cwd:
+	if (cwd)
+		close(*cwd);
+	return ret;
+}
+
+
+
 /**
  * Traverse the given directory recursively.
  *
@@ -227,10 +310,10 @@ static 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, ret2, ret = fsck_opendir(dirname, &dir, &cwd_fd);
 
 	if (ret < 0)
-		return ret == -ERRNO_TO_ERROR(EACCES)? 1 : ret;
+		return ret == -E_FSCK_ACCESS? 1 : ret;
 	/* scan cwd recursively */
 	while ((entry = readdir(dir))) {
 		mode_t m;
@@ -263,7 +346,7 @@ static int for_each_file_in_dir(const char *dirname,
 	ret = 1;
 out:
 	closedir(dir);
-	ret2 = para_fchdir(cwd_fd);
+	ret2 = __fchdir(cwd_fd);
 	if (ret2 < 0 && ret >= 0)
 		ret = ret2;
 	close(cwd_fd);
@@ -327,13 +410,8 @@ static int check_index_ranges(struct osl_table *t)
 				continue;
 			ret = check_range(t, i, j);
 			if (ret < 0) {
-				if (ret != -E_OSL_INVALID_OBJECT &&
-						ret != -E_FSCK_RANGE_VIOLATION)
+				if (ret != -E_FSCK_RANGE_VIOLATION)
 					goto err;
-				if (ret == -E_OSL_INVALID_OBJECT) {
-					CRIT_LOG("row %d, col %d maps to an "
-						"invalid object\n", i, j);
-				}
 				ret = mark_row_invalid(t, i);
 				if (ret < 0)
 					goto err;
@@ -412,7 +490,7 @@ static int prune_invalid_rows_from_index(struct osl_table *t)
 	DEBUG_LOG("unmapping index\n");
 	osl_munmap(t->index_map.data, t->index_map.size);
 	filename = index_filename(t->desc);
-	ret = para_truncate(filename, t->row_index_size
+	ret = truncate_file(filename, t->row_index_size
 		* t->num_invalid_rows);
 	free(filename);
 	if (ret < 0)
@@ -437,14 +515,9 @@ static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes)
 		for (j = 0; j < t->num_rows; j++) {
 			struct osl_object obj;
 			ret = get_mapped_object(t, i, j, &obj);
-			if (ret >= 0) {
-				loss[i] -= obj.size + 1; /* add one for header byte */
-				continue;
-			}
-			if (ret != -E_OSL_INVALID_OBJECT)
+			if (ret < 0)
 				goto err;
-			CRIT_LOG("row %d, col %d points to an invalid "
-				"mapped object, bad\n", j, i);
+			loss[i] -= obj.size;
 		}
 	}
 	ret = 0;
@@ -674,7 +747,7 @@ static unsigned files_pruned;
 int prune_disk_storage_file(const char *path, void *private_data)
 {
 	HASH_TYPE hash[HASH_SIZE];
-	unsigned flags = *(unsigned *)private_data;
+	uint8_t flags = *(uint8_t *)private_data;
 	struct osl_object obj = {.data = hash, .size = HASH_SIZE};
 	struct osl_row *row;
 	int ret = -1;
@@ -731,8 +804,9 @@ static int prune_disk_storage_files(struct osl_table *t)
 	INFO_LOG("looking for unreferenced disk storage files\n");
 	FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
 		char *dirname = column_filename(t, i);
+		uint8_t flags = t->desc->flags;
 		ret = for_each_file_in_dir(dirname, prune_disk_storage_file,
-			(unsigned *)&t->desc->flags);
+			&flags);
 		free(dirname);
 	}
 	if (files_pruned)
@@ -988,12 +1062,12 @@ static int dump_rows(char *dump_dir, struct osl_table *t)
 			current_dir = make_message("%s/rows_%u-%u", dump_dir, i, i + 999);
 			NOTICE_LOG("dumping rows %u - %u\n", i, i + 999);
 			ret = osl_mkdir(current_dir, 0777);
-			if (ret < 0 && !is_errno(-ret, EEXIST))
+			if (ret < 0 && ret != -E_OSL_DIR_EXISTS)
 				goto out;
 		}
 		row_dir = make_message("%s/row_%03u", current_dir, i);
 		ret = osl_mkdir(row_dir, 0777);
-		if (ret < 0 && !is_errno(-ret, EEXIST)) {
+		if (ret < 0 && ret != -E_OSL_DIR_EXISTS) {
 			free(row_dir);
 			goto out;
 		}
@@ -1017,11 +1091,11 @@ static int dump_table(char *dump_dir, struct osl_table_description *desc)
 	if (ret < 0)
 		goto out;
 	ret = osl_mkdir(dump_dir, 0777);
-	if (ret < 0 && !is_errno(-ret, EEXIST))
+	if (ret < 0 && ret != -E_OSL_DIR_EXISTS)
 		goto out;
 	table_dump_dir = make_message("%s/%s", dump_dir, desc->name);
 	ret = osl_mkdir(table_dump_dir, 0777);
-	if (ret < 0 && !is_errno(-ret, EEXIST))
+	if (ret < 0 && ret != -E_OSL_DIR_EXISTS)
 		goto out;
 	desc_file = make_message("%s/table_description.c", table_dump_dir);
 	ret = osl_open(desc_file, O_WRONLY | O_CREAT | O_EXCL, 0644);
@@ -1105,7 +1179,7 @@ static int check_all_tables(char *db_dir)
 {
 	DIR *dir;
 	struct dirent *entry;
-	int cwd_fd, ret2, ret = para_opendir(db_dir, &dir, &cwd_fd);
+	int cwd_fd, ret2, ret = fsck_opendir(db_dir, &dir, &cwd_fd);
 
 	if (ret < 0)
 		return ret;
@@ -1126,7 +1200,7 @@ static int check_all_tables(char *db_dir)
 			break;
 	}
 	closedir(dir);
-	ret2 = para_fchdir(cwd_fd);
+	ret2 = __fchdir(cwd_fd);
 	if (ret2 < 0 && ret >= 0)
 		ret = ret2;
 	close(cwd_fd);