osl.h depends on Makefile.

[osl.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index f325e537be8e30f23b093132effcef2e7d737879..1eb850bc6ffea78f68cf92fe99be4c5de3415c09 100644 (file)
--- 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 <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -1153,12 +1149,20 @@ int main(int argc, char **argv)
 {
        int i, ret;
        char *base_dir = NULL;
-
-       ret = fsck_cmdline_parser(argc, argv, &conf);
+       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, &params);
        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);
@@ -1167,6 +1171,7 @@ int main(int argc, char **argv)
                base_dir = make_message("%s/.paraslash/afs_database", home);
                free(home);
        }
+       INFO_LOG("base_dir: %s\n", base_dir);
        if (!conf.inputs_num) {
                ret = check_all_tables(base_dir);
                goto out;
@@ -1178,11 +1183,7 @@ int main(int argc, char **argv)
        }
 out:
        if (ret < 0) {
-               ERROR_LOG("%s%s: %s\n",
-                       base_dir? "base_dir: " : "",
-                       base_dir? base_dir : "",
-                       fsck_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);