X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=fsck.c;h=37195fce6e029924f0dab82fdb24eff3a668fd5a;hb=12ad4c1a67d9a94ac350750930405b419dc1895d;hp=d800017c4ba002b61751fe1ff7e298878d00b5fc;hpb=dd58755b9a202ab317f96e5dd5d9220c4354774a;p=osl.git diff --git a/fsck.c b/fsck.c index d800017..37195fc 100644 --- a/fsck.c +++ b/fsck.c @@ -6,10 +6,6 @@ /** \file fsck.c The program used to check an osl table. */ -/* FIXME: check error codes of make_message or write wrapper */ - - - #include #include #include @@ -40,24 +36,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 +311,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 +339,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 +453,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 +547,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 +626,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; @@ -1083,11 +1086,11 @@ out: return ret; } -static int check_table(char *base_dir, char *table_name) +static int check_table(char *db_dir, char *table_name) { struct osl_table_description desc = { .column_descriptions = NULL, - .dir = base_dir, + .dir = db_dir, .name = table_name }; int ret; @@ -1110,11 +1113,11 @@ out: return ret; } -static int check_all_tables(char *base_dir) +static int check_all_tables(char *db_dir) { DIR *dir; struct dirent *entry; - int cwd_fd, ret2, ret = para_opendir(base_dir, &dir, &cwd_fd); + int cwd_fd, ret2, ret = para_opendir(db_dir, &dir, &cwd_fd); if (ret < 0) return ret; @@ -1130,7 +1133,7 @@ static int check_all_tables(char *base_dir) m = s.st_mode; if (!S_ISDIR(m)) continue; - ret = check_table(base_dir, entry->d_name); + ret = check_table(db_dir, entry->d_name); if (ret < 0) break; } @@ -1145,44 +1148,48 @@ static int check_all_tables(char *base_dir) int main(int argc, char **argv) { int i, ret; - char *base_dir = NULL; - - ret = fsck_cmdline_parser(argc, argv, &conf); + char *db_dir = NULL; + 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); 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); + if (conf.database_dir_given) + db_dir = para_strdup(conf.database_dir_arg); else { char *home = para_homedir(); - base_dir = make_message("%s/.paraslash/afs_database", home); + db_dir = make_message("%s/.paraslash/afs_database", home); free(home); } + INFO_LOG("database dir: %s\n", db_dir); if (!conf.inputs_num) { - ret = check_all_tables(base_dir); + ret = check_all_tables(db_dir); goto out; } for (i = 0; i < conf.inputs_num; i++) { - ret = check_table(base_dir, conf.inputs[i]); + ret = check_table(db_dir, conf.inputs[i]); if (ret < 0) break; } 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) - ); + ERROR_LOG("%s\n", fsck_strerror(-ret)); if (conf.loglevel_arg > 1) EMERG_LOG("re-run with \"--loglevel %d\" to increase verbosity\n", conf.loglevel_arg - 1); } else NOTICE_LOG("success\n"); - if (base_dir) - free(base_dir); + if (db_dir) + free(db_dir); return ret < 0? EXIT_FAILURE : EXIT_SUCCESS; }