X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=fsck.c;h=f96f77c91fcc11327b12b605793e16b0fb966429;hp=ce8f1dc704c6c335f356233284a85093b11ddcad;hb=3f0d225f1e9892d59bcc2c3b23c8945526595fcc;hpb=188bc1b06879b7fcd56c599e20db0ac87a0da4e3 diff --git a/fsck.c b/fsck.c index ce8f1dc..f96f77c 100644 --- a/fsck.c +++ b/fsck.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -16,23 +17,15 @@ #include "osl.h" #include "util.h" #include "osl_core.h" -#include "fsck.cmdline.h" - -#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 .\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"), \ @@ -279,9 +272,10 @@ static int fsck_opendir(const char *dirname, DIR **dir, int *cwd) 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); @@ -389,7 +383,7 @@ static int check_range(struct osl_table *t, uint32_t row_num, uint32_t col_num) static int fsck_mark_row_invalid(struct osl_table *t, int i) { - if (conf.dry_run_given) + if (OPT_GIVEN(DRY_RUN)) return 0; return mark_row_invalid(t, i); } @@ -473,7 +467,7 @@ static int prune_invalid_rows_from_index(struct osl_table *t) } 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) + if (OPT_GIVEN(DRY_RUN)) return 0; NOTICE_LOG("removing invalid rows from index\n"); bottom = t->num_rows - 1; @@ -682,7 +676,7 @@ static int check_disk_storage_column(struct osl_table *t, int row_num, (*num_missing_objects)++; ERROR_LOG("row %d: object %s is missing\n", row_num, path); ret = 0; - if (conf.dry_run_given) + 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); @@ -803,7 +797,7 @@ static 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) + if (OPT_GIVEN(DRY_RUN)) return 0; NOTICE_LOG("removing %s\n", path); unlink(path); @@ -895,7 +889,7 @@ 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); @@ -1099,7 +1093,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); @@ -1153,7 +1147,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 && !conf.dry_run_given) { /* 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; @@ -1166,7 +1161,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, @@ -1176,15 +1171,15 @@ 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: %s\n", table_name, @@ -1194,7 +1189,7 @@ out: return ret; } -static int check_all_tables(char *db_dir) +static int check_all_tables(const char *db_dir) { DIR *dir; struct dirent *entry; @@ -1229,37 +1224,58 @@ 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, ¶ms); + 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 .\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 (i = 0; i < lls_num_inputs(lpr); i++) { + ret = check_table(dd, lls_input(i, 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;