X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=fsck.c;h=8e215e5e06bc61c4186c06e7e426a6e8a2fdefa4;hp=d800017c4ba002b61751fe1ff7e298878d00b5fc;hb=ce9a4422a0eee87c51b43b4fa2940b221af4166c;hpb=dd58755b9a202ab317f96e5dd5d9220c4354774a

diff --git a/fsck.c b/fsck.c
index d800017..8e215e5 100644
--- a/fsck.c
+++ b/fsck.c
@@ -40,24 +40,31 @@
 
 static struct fsck_args_info conf;
 
-enum fsck_errors {
-	E_RANGE_VIOLATION,
-	E_INVALID_OBJECT,
-	E_NOT_A_REGULAR_FILE,
-	E_FSCK_SYNTAX,
+#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"),
+
+#define FSCK_ERROR(num, txt) E_FSCK_ ## num
+enum {
+	FSCK_DUMMY = (1 << FSCK_ERROR_BIT) - 1,
+	FSCK_ERRORS
+};
+#undef FSCK_ERROR
+#define FSCK_ERROR(num, txt) txt
+const char const *fsck_errors[] = {
+	FSCK_ERRORS
 };
 
-__printf_2_3 void para_log(int ll, const char* fmt,...)
+static const char *fsck_strerror(int num)
 {
-	va_list argp;
-
-	if (ll < conf.loglevel_arg)
-		return;
-	va_start(argp, fmt);
-	vfprintf(stderr, fmt, argp);
-	va_end(argp);
+	if (num & (1 << FSCK_ERROR_BIT))
+		return fsck_errors[num & ((1 << FSCK_ERROR_BIT) - 1)];
+	return osl_strerror(num);
 }
 
+extern int loglevel;
+
 /* taken from git */
 signed char hexval_table[256] = {
 	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 00-07 */
@@ -308,7 +315,7 @@ static int check_range(struct osl_table *t, uint32_t row_num, uint32_t col_num)
 	if (obj_start < map_start || obj_start + obj.size > map_start + col->data_map.size) {
 		CRIT_LOG("range violation in row %u, col %u\n", row_num,
 			col_num);
-		return -E_RANGE_VIOLATION;
+		return -E_FSCK_RANGE_VIOLATION;
 	}
 	DEBUG_LOG("col %u: ok\n", col_num);
 	return 1;
@@ -336,10 +343,10 @@ static int check_index_ranges(struct osl_table *t)
 				continue;
 			ret = check_range(t, i, j);
 			if (ret < 0) {
-				if (ret != -E_INVALID_OBJECT &&
-						ret != -E_RANGE_VIOLATION)
+				if (ret != -E_OSL_INVALID_OBJECT &&
+						ret != -E_FSCK_RANGE_VIOLATION)
 					goto err;
-				if (ret == -E_INVALID_OBJECT) {
+				if (ret == -E_OSL_INVALID_OBJECT) {
 					CRIT_LOG("row %d, col %d maps to an "
 						"invalid object\n", i, j);
 				}
@@ -450,7 +457,7 @@ static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes)
 				loss[i] -= obj.size + 1; /* add one for header byte */
 				continue;
 			}
-			if (ret != -E_INVALID_OBJECT)
+			if (ret != -E_OSL_INVALID_OBJECT)
 				goto err;
 			CRIT_LOG("row %d, col %d points to an invalid "
 				"mapped object, bad\n", j, i);
@@ -544,7 +551,7 @@ static int prune_objects(struct osl_table *t, uint32_t *lost_bytes)
 		ret = osl_rename(new_col_filenames[i], col_filenames[i]);
 		if (ret < 0) { /* we're kinda screwed here */
 			CRIT_LOG("rename of col %i failed: %s\n", i,
-				strerror(errno));
+				osl_strerror(errno));
 			goto out_free;
 		}
 	}
@@ -623,7 +630,7 @@ out:
 	free(path);
 	if (ret < 0)
 		return ret;
-	ret = -E_NOT_A_REGULAR_FILE;
+	ret = -E_FSCK_NOT_A_REGULAR_FILE;
 	if (!(S_IFREG & statbuf.st_mode))
 		return ret;
 	return 1;
@@ -1146,12 +1153,20 @@ int main(int argc, char **argv)
 {
 	int i, ret;
 	char *base_dir = NULL;
-
-	ret = fsck_cmdline_parser(argc, argv, &conf);
+	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);
 	if (ret < 0) {
+		loglevel = EMERG;
 		ret = -E_FSCK_SYNTAX;
 		goto out;
 	}
+	loglevel = conf.loglevel_arg;
 	HANDLE_VERSION_FLAG("fsck", conf);
 	if (conf.base_dir_given)
 		base_dir = para_strdup(conf.base_dir_arg);
@@ -1160,6 +1175,7 @@ int main(int argc, char **argv)
 		base_dir = make_message("%s/.paraslash/afs_database", home);
 		free(home);
 	}
+	INFO_LOG("base_dir: %s\n", base_dir);
 	if (!conf.inputs_num) {
 		ret = check_all_tables(base_dir);
 		goto out;
@@ -1171,11 +1187,10 @@ int main(int argc, char **argv)
 	}
 out:
 	if (ret < 0) {
-		/* FIXME: osl_strerror() is BAD!!! */
 		ERROR_LOG("%s%s: %s\n",
 			base_dir? "base_dir: " : "",
 			base_dir? base_dir : "",
-			osl_strerror(-ret)
+			fsck_strerror(-ret)
 		);
 		if (conf.loglevel_arg > 1)
 			EMERG_LOG("re-run with \"--loglevel %d\" to increase verbosity\n",