X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=fsck.c;h=3ad043b94e9bca2cddd8b4c4fd79e85e5906b182;hp=22f6609e01e2e473b3b76370148d746c4ec31fec;hb=23dc00453efa7eb5a19036a4c90ca409225189cb;hpb=527af27eeb0753af7f7132cf60b7d283c652b9d0

diff --git a/fsck.c b/fsck.c
index 22f6609..3ad043b 100644
--- a/fsck.c
+++ b/fsck.c
@@ -18,8 +18,7 @@
 #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" \
+#define VERSION_TEXT(prefix) "osl" prefix " " VERSION " " "\n" \
 	"Copyright (C) 2008-2009 Andre Noll\n" \
 	"This is free software with ABSOLUTELY NO WARRANTY." \
 	" See COPYING for details.\n" \
@@ -51,7 +50,7 @@ enum {
 };
 #undef FSCK_ERROR
 #define FSCK_ERROR(num, txt) txt
-const char const *fsck_errors[] = {
+static const char *fsck_errors[] = {
 	FSCK_ERRORS
 };
 
@@ -65,7 +64,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 */
@@ -100,7 +99,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;
@@ -388,6 +387,13 @@ 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 (conf.dry_run_given)
+		return 0;
+	return mark_row_invalid(t, i);
+}
+
 /*
  * check all cells of the given table for boundary violations
  */
@@ -410,7 +416,7 @@ static int check_index_ranges(struct osl_table *t)
 			if (ret < 0) {
 				if (ret != -E_FSCK_RANGE_VIOLATION)
 					goto err;
-				ret = mark_row_invalid(t, i);
+				ret = fsck_mark_row_invalid(t, i);
 				if (ret < 0)
 					goto err;
 				t->num_invalid_rows++;
@@ -465,8 +471,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 (conf.dry_run_given)
+		return 0;
+	NOTICE_LOG("removing invalid rows from index\n");
 	bottom = t->num_rows - 1;
 	while (top < bottom) {
 		if (!row_is_invalid(t, top)) {
@@ -672,11 +681,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 (conf.dry_run_given)
+			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;
 		}
@@ -745,7 +757,7 @@ 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];
 	uint8_t flags = *(uint8_t *)private_data;
@@ -791,6 +803,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 (conf.dry_run_given)
+		return 0;
 	NOTICE_LOG("removing %s\n", path);
 	unlink(path);
 	files_pruned++;
@@ -915,7 +929,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);
@@ -930,7 +944,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;
 
@@ -1139,7 +1153,7 @@ 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 && !conf.dry_run_given) { /* at least one mapped data file needs pruning */
 		ret = prune_objects(t, lost_bytes);
 		if (ret < 0)
 			goto out_unmap;