/*
- * Copyright (C) 2007-2009 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.
*/
#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" \
"Written by Andre Noll.\n" \
- "Report bugs to <maan@systemlinux.org>.\n"
+ "Report bugs to <maan@tuebingen.mpg.de>.\n"
/** print out \p VERSION_TEXT and exit if version flag was given */
#define HANDLE_VERSION_FLAG(_prefix, _args_info_struct) \
};
#undef FSCK_ERROR
#define FSCK_ERROR(num, txt) txt
-const char const *fsck_errors[] = {
+static const char *fsck_errors[] = {
FSCK_ERRORS
};
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 */
-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;
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);
+ /* 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 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
*/
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++;
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)) {
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;
}
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;
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++;
#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);
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;
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;