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

diff --git a/fsck.c b/fsck.c
index 55c134a..e814df5 100644
--- a/fsck.c
+++ b/fsck.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,38 +9,33 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <lopsub.h>
 #include <assert.h>
 #include <pwd.h>
 
 #include "log.h"
 #include "osl.h"
-#include "error.h"
-#include "fd.h"
+#include "util.h"
 #include "osl_core.h"
-#include "fsck.cmdline.h"
-
-/** version text used by various commands if -V switch was given */
-#define VERSION_TEXT(prefix) "osl_" prefix " " VERSION " " "\n" \
-	"Copyright (C) 2008 Andre Noll\n" \
-	"This is free software with ABSOLUTELY NO WARRANTY." \
-	" See COPYING for details.\n" \
-	"Written by Andre Noll.\n" \
-	"Report bugs to <maan@systemlinux.org>.\n"
-
-/** print out \p VERSION_TEXT and exit if version flag was given */
-#define HANDLE_VERSION_FLAG(_prefix, _args_info_struct) \
-	if (_args_info_struct.version_given) { \
-		printf("%s", VERSION_TEXT(_prefix)); \
-		exit(EXIT_SUCCESS); \
-	}
+#include "oslfsck.lsg.h"
 
-static struct fsck_args_info conf;
+static struct lls_parse_result *lpr;
+#define CMD_PTR (lls_cmd(0, oslfsck_suite))
+#define OPT_RESULT(_name) \
+	(lls_opt_result(LSG_OSLFSCK_OSLFSCK_OPT_ ## _name, lpr))
+#define OPT_GIVEN(_name) (lls_opt_given(OPT_RESULT(_name)))
+#define OPT_STRING_VAL(_name) (lls_string_val(0, OPT_RESULT(_name)))
+#define OPT_UINT32_VAL(_name) (lls_uint32_val(0, OPT_RESULT(_name)))
 
 #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,
@@ -48,7 +43,7 @@ enum {
 };
 #undef FSCK_ERROR
 #define FSCK_ERROR(num, txt) txt
-const char const *fsck_errors[] = {
+static const char *fsck_errors[] = {
 	FSCK_ERRORS
 };
 
@@ -62,7 +57,7 @@ static const char *fsck_strerror(int num)
 extern int loglevel;
 
 /* taken from git */
-signed char hexval_table[256] = {
+static signed char hexval_table[256] = {
 	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 00-07 */
 	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 08-0f */
 	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 10-17 */
@@ -97,7 +92,7 @@ signed char hexval_table[256] = {
 	 -1, -1, -1, -1, -1, -1, -1, -1,		/* f8-ff */
 };
 
-int asc_to_hash(const char *asc_hash, int len, HASH_TYPE *hash)
+static int asc_to_hash(const char *asc_hash, int len, HASH_TYPE *hash)
 {
 	int i = 0;
 	const unsigned char *asc = (const unsigned char *) asc_hash;
@@ -118,8 +113,8 @@ static int _write_all(int fd, const char *buf, size_t len)
 	return write_all(fd, buf, &len);
 }
 
-/**
- * Paraslash's version of malloc().
+/*
+ * Wrapper for malloc().
  *
  * \param size The desired new size.
  *
@@ -144,7 +139,7 @@ __must_check __malloc static void *fsck_malloc(size_t size)
 }
 
 /**
- * Paraslash's version of calloc().
+ * Allocate memory and fill with zeros.
  *
  * \param size The desired new size.
  *
@@ -164,7 +159,7 @@ __must_check __malloc static void *fsck_calloc(size_t size)
 }
 
 /**
- * Paraslash's version of strdup().
+ * Save version of strdup().
  *
  * \param s The string to be duplicated.
  *
@@ -208,6 +203,87 @@ 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) {
+		int __a_unused ret2 = fchdir(*cwd); /* STFU, gcc */
+	}
+close_cwd:
+	if (cwd)
+		close(*cwd);
+	return ret;
+}
+
+
+
 /**
  * Traverse the given directory recursively.
  *
@@ -227,10 +303,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 +339,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);
@@ -305,36 +381,37 @@ static int check_range(struct osl_table *t, uint32_t row_num, uint32_t col_num)
 	return 1;
 }
 
+static int fsck_mark_row_invalid(struct osl_table *t, int i)
+{
+	if (OPT_GIVEN(DRY_RUN))
+		return 0;
+	return mark_row_invalid(t, i);
+}
+
 /*
  * check all cells of the given table for boundary violations
  */
 static int check_index_ranges(struct osl_table *t)
 {
-	int i, j, ret;
+	int ret;
+	unsigned k, n;
 
 	INFO_LOG("checking for range violations in index\n");
 	//DEBUG_LOG("%d rows. %d columns\n", t->num_rows, t->desc->num_columns);
 	t->num_invalid_rows = 0;
-	for (i = 0; i < t->num_rows; i++) {
-		if (row_is_invalid(t, i)) {
+	for (n = 0; n < t->num_rows; n++) {
+		const struct osl_column_description *cd;
+
+		if (row_is_invalid(t, n)) {
 			t->num_invalid_rows++;
 			continue;
 		}
-		for (j = 0; j < t->desc->num_columns; j++) { /* FXIME */
-			const struct osl_column_description *cd =
-				get_column_description(t->desc, j);
-			if (cd->storage_type != OSL_MAPPED_STORAGE)
-				continue;
-			ret = check_range(t, i, j);
+		FOR_EACH_MAPPED_COLUMN(k, t, cd) {
+			ret = check_range(t, n, k);
 			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);
+				ret = fsck_mark_row_invalid(t, n);
 				if (ret < 0)
 					goto err;
 				t->num_invalid_rows++;
@@ -389,8 +466,11 @@ static int prune_invalid_rows_from_index(struct osl_table *t)
 		INFO_LOG("all rows are valid, good\n");
 		return 1;
 	}
-	NOTICE_LOG("deleting %u invalid row(s) (%d bytes) from index\n",
+	NOTICE_LOG("index contains %u invalid row(s) (%d bytes)\n",
 		t->num_invalid_rows, t->row_index_size * t->num_invalid_rows);
+	if (OPT_GIVEN(DRY_RUN))
+		return 0;
+	NOTICE_LOG("removing invalid rows from index\n");
 	bottom = t->num_rows - 1;
 	while (top < bottom) {
 		if (!row_is_invalid(t, top)) {
@@ -412,7 +492,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)
@@ -426,32 +506,30 @@ static int prune_invalid_rows_from_index(struct osl_table *t)
 
 static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes)
 {
-	int i, j, ret;
+	int ret;
+	unsigned k, n;
 	const struct osl_column_description *cd;
 	uint32_t *loss = fsck_malloc(sizeof(uint32_t) * t->desc->num_columns);
 
 	INFO_LOG("looking for mapped objects not contained in index\n");
 	/* first count used bytes */
-	FOR_EACH_MAPPED_COLUMN(i, t, cd) {
-		loss[i] = t->columns[i].data_map.size;
-		for (j = 0; j < t->num_rows; j++) {
+	FOR_EACH_MAPPED_COLUMN(k, t, cd) {
+		loss[k] = t->columns[k].data_map.size;
+		DEBUG_LOG("column %i data map: %zu bytes\n", k,
+			t->columns[k].data_map.size);
+		for (n = 0; n < t->num_rows; n++) {
 			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)
+			ret = get_mapped_object(t, k, n, &obj);
+			if (ret < 0)
 				goto err;
-			CRIT_LOG("row %d, col %d points to an invalid "
-				"mapped object, bad\n", j, i);
+			loss[k] -= obj.size;
 		}
 	}
 	ret = 0;
-	FOR_EACH_MAPPED_COLUMN(i, t, cd) {
-		if (loss[i]) {
+	FOR_EACH_MAPPED_COLUMN(k, t, cd) {
+		if (loss[k]) {
 			NOTICE_LOG("column %u contains %u lost bytes\n",
-				i, loss[i]);
+				k, loss[k]);
 			ret = 1;
 		}
 	}
@@ -467,24 +545,25 @@ err:
 /* prune_invalid_rows() must be run on the table before calling this */
 static int prune_mapped_column(struct osl_table *t, uint32_t col_num, int fd)
 {
-	int i, ret;
+	int ret;
+	unsigned n;
 	uint32_t written = 0;
 	struct osl_column *col = t->columns + col_num;
 
 	INFO_LOG("pruning col %u\n", col_num);
-	for (i = 0; i < t->num_rows; i++) {
+	for (n = 0; n < t->num_rows; n++) {
 		struct osl_object obj;
 		char *index_entry;
 
-		DEBUG_LOG("checking row %u/%u\n", i, t->num_rows);
-		ret = get_mapped_object(t, col_num, i, &obj);
+		DEBUG_LOG("checking row %u/%u\n", n, t->num_rows);
+		ret = get_mapped_object(t, col_num, n, &obj);
 		if (ret < 0)
 			return ret;
-		ret = _write_all(fd, (char *)(obj.data) - 1, obj.size + 1);
+		ret = _write_all(fd, (char *)(obj.data), obj.size);
 		if (ret < 0)
 			return ret;
-		written += obj.size + 1;
-		ret = get_row_index(t, i, &index_entry);
+		written += obj.size;
+		ret = get_row_index(t, n, &index_entry);
 		if (ret < 0)
 			return ret;
 		update_cell_index(index_entry, col, written, obj.size);
@@ -504,7 +583,8 @@ static int prune_objects(struct osl_table *t, uint32_t *lost_bytes)
 
 	NOTICE_LOG("removing unreferenced objects from data files\n");
 	/* first make a copy of the index */
-	ret = osl_open(old_idx_filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
+	DEBUG_LOG("opening %s\n", old_idx_filename);
+	ret = osl_open(old_idx_filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
 	if (ret < 0)
 		goto out_free;
 	fd = ret;
@@ -598,11 +678,14 @@ static int check_disk_storage_column(struct osl_table *t, int row_num,
 		struct osl_row *row;
 		(*num_missing_objects)++;
 		ERROR_LOG("row %d: object %s is missing\n", row_num, path);
+		ret = 0;
+		if (OPT_GIVEN(DRY_RUN))
+			goto out;
 		NOTICE_LOG("trying to delete row %d\n", row_num);
 		ret = osl_get_row(t, dsnc, &obj, &row);
 		if (ret < 0) {
 			CRIT_LOG("unable to get row %d\n", row_num);
-			mark_row_invalid(t, row_num);
+			fsck_mark_row_invalid(t, row_num);
 			CRIT_LOG("Please re-run fsck\n");
 			goto out;
 		}
@@ -622,7 +705,8 @@ out:
 
 static int check_disk_storage_presence(struct osl_table *t)
 {
-	int ret, i, j;
+	int ret;
+	unsigned k, n;
 	struct osl_object obj, hash_obj = {.size = HASH_SIZE};
 	char *ds_name;
 	const struct osl_column_description *cd;
@@ -632,18 +716,18 @@ static int check_disk_storage_presence(struct osl_table *t)
 		return 1;
 	hashes = fsck_malloc(t->num_rows * HASH_SIZE);
 	INFO_LOG("looking for missing disk storage objects\n");
-	for (i = 0; i < t->num_rows; i++) {
-		if (row_is_invalid(t, i))
+	for (k = 0; k < t->num_rows; k++) {
+		if (row_is_invalid(t, k))
 			continue;
-		ret = get_mapped_object(t, dsnc, i, &obj);
+		ret = get_mapped_object(t, dsnc, k, &obj);
 		if (ret < 0)
 			return ret;
-		hash_object(&obj, hashes + i * HASH_SIZE);
-		hash_obj.data = hashes + i * HASH_SIZE;
+		hash_object(&obj, hashes + k * HASH_SIZE);
+		hash_obj.data = hashes + k * HASH_SIZE;
 		osl_add_row(hash_tree_table, &hash_obj);
-		ds_name = disk_storage_name_of_hash(t, hashes + i * HASH_SIZE);
-		FOR_EACH_DISK_STORAGE_COLUMN(j, t, cd) {
-			ret = check_disk_storage_column(t, i, j, ds_name,
+		ds_name = disk_storage_name_of_hash(t, hashes + k * HASH_SIZE);
+		FOR_EACH_DISK_STORAGE_COLUMN(n, t, cd) {
+			ret = check_disk_storage_column(t, k, n, ds_name,
 				&missing_objects);
 			if (ret < 0)
 				goto err;
@@ -671,10 +755,10 @@ static int dummy_compare(const struct osl_object *obj1, const struct osl_object
 
 static unsigned files_pruned;
 
-int prune_disk_storage_file(const char *path, void *private_data)
+static 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;
@@ -717,6 +801,8 @@ int prune_disk_storage_file(const char *path, void *private_data)
 invalid:
 	ERROR_LOG("could not read hash value of %s\n", path);
 remove:
+	if (OPT_GIVEN(DRY_RUN))
+		return 0;
 	NOTICE_LOG("removing %s\n", path);
 	unlink(path);
 	files_pruned++;
@@ -731,8 +817,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)
@@ -806,12 +893,15 @@ static int fsck_init(struct osl_table_description *desc, struct osl_table **t)
 	}
 	DEBUG_LOG("unmapping index\n");
 	osl_munmap(map.data, map.size);
-	if (conf.force_given)
+	if (OPT_GIVEN(FORCE))
 		ret = map_table(*t, (MAP_TBL_FL_IGNORE_DIRTY));
 	else
 		ret = map_table(*t, 0);
-	if (ret >= 0)
+	if (ret >= 0) {
 		(*t)->num_rows = table_num_rows(*t);
+		DEBUG_LOG("index header size: %d\n", (*t)->index_header_size);
+		DEBUG_LOG("row index size: %d\n", (*t)->row_index_size);
+	}
 out:
 	return ret;
 }
@@ -837,7 +927,7 @@ static void fsck_cleanup(struct osl_table *t)
 
 #define ST_CASE(st) case st: return #st
 
-const char *get_asc_storage_type(enum osl_storage_type st)
+static const char *get_asc_storage_type(enum osl_storage_type st)
 {
 	switch (st) {
 		ST_CASE(OSL_MAPPED_STORAGE);
@@ -852,7 +942,7 @@ const char *get_asc_storage_type(enum osl_storage_type st)
 	else str = fsck_strdup(#flag); }} while (0)
 
 
-char *get_asc_storage_flags(enum osl_storage_type sf)
+static char *get_asc_storage_flags(enum osl_storage_type sf)
 {
 	char *asc_sf = NULL;
 
@@ -988,12 +1078,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;
 		}
@@ -1007,7 +1097,7 @@ out:
 	return ret;
 }
 
-static int dump_table(char *dump_dir, struct osl_table_description *desc)
+static int dump_table(const char *dump_dir, struct osl_table_description *desc)
 {
 	struct osl_table *t = NULL;
 	int fd, ret = fsck_init(desc, &t);
@@ -1017,11 +1107,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);
@@ -1061,7 +1151,8 @@ static int fsck(struct osl_table_description *desc)
 	ret = check_for_invalid_objects(t, &lost_bytes);
 	if (ret < 0)
 		goto out_unmap;
-	if (ret > 0) { /* at least one mapped data file needs pruning */
+	if (ret > 0 && !OPT_GIVEN(DRY_RUN)) {
+		/* at least one mapped data file needs pruning */
 		ret = prune_objects(t, lost_bytes);
 		if (ret < 0)
 			goto out_unmap;
@@ -1074,7 +1165,7 @@ out:
 	return ret;
 }
 
-static int check_table(char *db_dir, char *table_name)
+static int check_table(const char *db_dir, const char *table_name)
 {
 	struct osl_table_description desc = {
 		.column_descriptions = NULL,
@@ -1084,28 +1175,29 @@ static int check_table(char *db_dir, char *table_name)
 	int ret;
 
 	INFO_LOG("checking table %s\n", table_name);
-	if (!conf.no_fsck_given) {
+	if (!OPT_GIVEN(NO_FSCK)) {
 		ret = fsck(&desc);
 		if (ret < 0)
 			goto out;
 	}
 	ret = 1;
-	if (!conf.dump_dir_given || !*conf.dump_dir_arg)
+	if (!OPT_GIVEN(DUMP_DIR) || !*OPT_STRING_VAL(DUMP_DIR))
 		goto out;
-	ret = dump_table(conf.dump_dir_arg, &desc);
+	ret = dump_table(OPT_STRING_VAL(DUMP_DIR), &desc);
 out:
 	if (ret < 0)
-		ERROR_LOG("failed to check table %s\n", table_name);
+		ERROR_LOG("failed to check table %s: %s\n", table_name,
+			fsck_strerror(-ret));
 	else
 		NOTICE_LOG("successfully checked table %s\n", table_name);
 	return ret;
 }
 
-static int check_all_tables(char *db_dir)
+static int check_all_tables(const 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 +1218,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);
@@ -1135,38 +1227,60 @@ static int check_all_tables(char *db_dir)
 
 int main(int argc, char **argv)
 {
-	int i, ret;
-	struct fsck_cmdline_parser_params params = {
-		.override = 0,
-		.initialize = 1,
-		.check_required = 1,
-		.check_ambiguity = 1,
-		.print_errors = 1
-	};
-	ret = fsck_cmdline_parser_ext(argc, argv, &conf, &params);
+	int ret;
+	unsigned n;
+	char *errctx = NULL;
+	const char *dd;
+
+	loglevel = 0;
+	ret = lls_parse(argc, argv, CMD_PTR, &lpr, &errctx);
 	if (ret < 0) {
-		loglevel = EMERG;
-		ret = -E_FSCK_SYNTAX;
-		goto out;
+		if (errctx)
+			ERROR_LOG("%s\n", errctx);
+		EMERG_LOG("%s\n", lls_strerror(-ret));
+		exit(EXIT_FAILURE);
+	}
+	loglevel = OPT_UINT32_VAL(LOGLEVEL);
+	if (OPT_GIVEN(DETAILED_HELP)) {
+		printf("%s\n", lls_long_help(CMD_PTR));
+		exit(EXIT_SUCCESS);
+	}
+	if (OPT_GIVEN(HELP)) {
+		printf("%s\n", lls_short_help(CMD_PTR));
+		exit(EXIT_SUCCESS);
+	}
+	if (OPT_GIVEN(VERSION)) {
+		printf(
+			"oslfsck " OSL_VERSION "\n"
+			"Copyright (C) 2008-2009 Andre Noll\n"
+			"This is free software with ABSOLUTELY NO WARRANTY."
+			" See COPYING for details.\n"
+			"Written by Andre Noll.\n"
+			"Report bugs to <maan@tuebingen.mpg.de>.\n"
+		);
+		exit(EXIT_SUCCESS);
+	}
+	dd = OPT_STRING_VAL(DATABASE_DIR);
+	if (!dd) {
+		EMERG_LOG("--database-dir: mandatory option not given\n");
+		exit(EXIT_FAILURE);
 	}
-	loglevel = conf.loglevel_arg;
-	HANDLE_VERSION_FLAG("fsck", conf);
-	INFO_LOG("database dir: %s\n", conf.database_dir_arg);
-	if (!conf.inputs_num) {
-		ret = check_all_tables(conf.database_dir_arg);
+	INFO_LOG("database dir: %s\n", dd);
+	if (lls_num_inputs(lpr) == 0) {
+		ret = check_all_tables(dd);
 		goto out;
 	}
-	for (i = 0; i < conf.inputs_num; i++) {
-		ret = check_table(conf.database_dir_arg, conf.inputs[i]);
+	for (n = 0; n < lls_num_inputs(lpr); n++) {
+		ret = check_table(dd, lls_input(n, lpr));
 		if (ret < 0)
 			break;
 	}
 out:
 	if (ret < 0) {
 		ERROR_LOG("%s\n", fsck_strerror(-ret));
-		if (conf.loglevel_arg > 1)
+		if (loglevel > 1)
 			EMERG_LOG("re-run with \"--loglevel %d\" to increase verbosity\n",
-				conf.loglevel_arg - 1);
+				loglevel - 1);
 	} else
 		NOTICE_LOG("success\n");
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;