/** \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>
*
* \sa malloc(3).
*/
-__must_check __malloc static void *para_malloc(size_t size)
+__must_check __malloc static void *fsck_malloc(size_t size)
{
assert(size);
void *p = malloc(size);
*
* \sa calloc(3)
*/
-__must_check __malloc static void *para_calloc(size_t size)
+__must_check __malloc static void *fsck_calloc(size_t size)
{
- void *ret = para_malloc(size);
+ void *ret = fsck_malloc(size);
memset(ret, 0, size);
return ret;
*
* \sa strdup(3)
*/
-__must_check __malloc static char *para_strdup(const char *s)
+__must_check __malloc static char *fsck_strdup(const char *s)
{
char *ret;
exit(EXIT_FAILURE);
}
-/**
- * Get the home directory of the current user.
- *
- * \return A dynammically allocated string that must be freed by the caller. If
- * the home directory could not be found, this function returns "/tmp".
- */
-__must_check __malloc static char *para_homedir(void)
-{
- struct passwd *pw = getpwuid(getuid());
- return para_strdup(pw? pw->pw_dir : "/tmp");
-}
-
/**
* Compare two osl objects pointing to unsigned integers of 32 bit size.
*
DEBUG_LOG("unmapping index\n");
osl_munmap(t->index_map.data, t->index_map.size);
filename = index_filename(t->desc);
- ret = para_truncate(filename, t->row_index_size
+ ret = truncate_file(filename, t->row_index_size
* t->num_invalid_rows);
free(filename);
if (ret < 0)
{
int i, j, ret;
const struct osl_column_description *cd;
- uint32_t *loss = para_malloc(sizeof(uint32_t) * t->desc->num_columns);
+ uint32_t *loss = fsck_malloc(sizeof(uint32_t) * t->desc->num_columns);
INFO_LOG("looking for mapped objects not contained in index\n");
/* first count used bytes */
{
int i, ret;
const struct osl_column_description *cd;
- char **col_filenames = para_calloc(t->desc->num_columns * sizeof(char *));
- char **new_col_filenames = para_calloc(t->desc->num_columns * sizeof(char *));
+ char **col_filenames = fsck_calloc(t->desc->num_columns * sizeof(char *));
+ char **new_col_filenames = fsck_calloc(t->desc->num_columns * sizeof(char *));
char *idx_filename = index_filename(t->desc);
char *old_idx_filename = make_message("%s.bak", idx_filename);
int fd;
if (!t->num_rows)
return 1;
- hashes = para_malloc(t->num_rows * HASH_SIZE);
+ hashes = fsck_malloc(t->num_rows * HASH_SIZE);
INFO_LOG("looking for missing disk storage objects\n");
for (i = 0; i < t->num_rows; i++) {
if (row_is_invalid(t, i))
#define APPEND_ASC_SF(sf, flag, str) do { if (sf & flag) { \
if (str) str = make_message("%s%s", str, " | " # flag); \
- else str = para_strdup(#flag); }} while (0)
+ else str = fsck_strdup(#flag); }} while (0)
char *get_asc_storage_flags(enum osl_storage_type sf)
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;
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;
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;
}
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, ¶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);
- else {
- char *home = para_homedir();
- base_dir = make_message("%s/.paraslash/afs_database", home);
- free(home);
- }
+ INFO_LOG("database dir: %s\n", conf.database_dir_arg);
if (!conf.inputs_num) {
- ret = check_all_tables(base_dir);
+ ret = check_all_tables(conf.database_dir_arg);
goto out;
}
for (i = 0; i < conf.inputs_num; i++) {
- ret = check_table(base_dir, conf.inputs[i]);
+ ret = check_table(conf.database_dir_arg, 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);
return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
}