Rename base_dir to database-dir and check in fsck.ggo.

[osl.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index 8e215e5e06bc61c4186c06e7e426a6e8a2fdefa4..37195fce6e029924f0dab82fdb24eff3a668fd5a 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>
@@ -1090,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;
@@ -1117,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;
@@ -1137,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;
        }
@@ -1152,7 +1148,7 @@ static int check_all_tables(char *base_dir)
 int main(int argc, char **argv)
 {
        int i, ret;
-       char *base_dir = NULL;
+       char *db_dir = NULL;
        struct fsck_cmdline_parser_params params = {
                .override = 0,
                .initialize = 1,
@@ -1168,36 +1164,32 @@ int main(int argc, char **argv)
        }
        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("base_dir: %s\n", base_dir);
+       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) {
-               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);
        } else
                NOTICE_LOG("success\n");
-       if (base_dir)
-               free(base_dir);
+       if (db_dir)
+               free(db_dir);
        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }