Add COPYING file.

[osl.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index 68f08d99249344c6a92ad29f4bc6048886ea4c92..84e624d7981a822efa923d9b1ffcfd83a2f672fd 100644 (file)
--- 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@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -20,7 +20,7 @@
 
 /** 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" \
+       "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" \
@@ -388,6 +388,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 +417,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 +472,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)) {
@@ -510,7 +520,7 @@ static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes)
        /* first count used bytes */
        FOR_EACH_MAPPED_COLUMN(i, t, cd) {
                loss[i] = t->columns[i].data_map.size;
-               DEBUG_LOG("column %i data map: %u bytes\n", i,
+               DEBUG_LOG("column %i data map: %zu bytes\n", i,
                        t->columns[i].data_map.size);
                for (j = 0; j < t->num_rows; j++) {
                        struct osl_object obj;
@@ -672,11 +682,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;
                }
@@ -791,6 +804,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++;
@@ -1139,7 +1154,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;