/*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** Options passed to --select-options. */
struct select_args_info select_conf;
+/** Computed database dir */
+char *database_dir;
/**
* The table containing the directory names and statistics.
va_end(argp);
}
+/**
+ * adu's version of strerror(3).
+ *
+ * \param num The error number.
+ *
+ * \return The error text of \a num.
+ */
+const char *adu_strerror(int num)
+{
+ assert(num > 0);
+ if (num == E_OSL) {
+ assert(osl_errno > 0);
+ return osl_strerror((osl_errno));
+ }
+ if (IS_SYSTEM_ERROR(num))
+ return strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1));
+ return adu_errlist[num];
+}
+
static void close_dir_table(void)
{
int ret;
exit(EXIT_FAILURE);
}
+static int catch_signal(int sig)
+{
+ struct sigaction act;
+
+ act.sa_handler = signal_handler;
+ sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+ return sigaction(sig, &act, NULL);
+}
+
static int init_signals(void)
{
- if (signal(SIGINT, &signal_handler) == SIG_ERR)
- return -E_SIGNAL_SIG_ERR;
- if (signal(SIGTERM, &signal_handler) == SIG_ERR)
- return -E_SIGNAL_SIG_ERR;
- if (signal(SIGPIPE, &signal_handler) == SIG_ERR)
- return -E_SIGNAL_SIG_ERR;
+ if (catch_signal(SIGINT) < 0)
+ return -E_SIGACTION;
+ if (catch_signal(SIGTERM) < 0)
+ return -E_SIGACTION;
+ if (catch_signal(SIGPIPE) < 0)
+ return -E_SIGACTION;
return 1;
}
*/
int open_dir_table(int create)
{
+ int ret;
if (dir_table)
return 1;
- dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
+ dir_table_desc.dir = adu_strdup(database_dir);
if (create) {
+ INFO_LOG("creating database directory structure\n");
+ ret = mkpath(dir_table_desc.dir, 0777);
+ if (ret < 0)
+ goto out;
NOTICE_LOG("creating dir table\n");
- int ret = osl(osl_create_table(&dir_table_desc));
+ ret = osl(osl_create_table(&dir_table_desc));
if (ret < 0) {
- free((char *)dir_table_desc.dir);
- return ret;
+ ERROR_LOG("could not create %s\n", dir_table_desc.dir);
+ goto out;
}
}
INFO_LOG("opening dir table\n");
return osl(osl_open_table(&dir_table_desc, &dir_table));
+out:
+ free((char *)dir_table_desc.dir);
+ return ret;
}
static int check_args(void)
exit(EXIT_FAILURE);
}
+static void get_database_dir_or_die(void)
+{
+ char *tmp;
+
+ if (conf.database_dir_given)
+ tmp = adu_strdup(conf.database_dir_arg);
+ else
+ tmp = make_message("%s%s",
+ conf.database_root_arg, conf.base_dir_arg);
+ /*
+ * As we change the cwd during database creation, database_dir
+ * must be an absolute path.
+ */
+ database_dir = absolute_path(tmp);
+ free(tmp);
+ if (database_dir)
+ return;
+ EMERG_LOG("failed to get absolute path of database dir\n");
+ exit(EXIT_FAILURE);
+}
+
/**
* The main function of adu.
*
ret = init_signals();
if (ret < 0)
goto out;
- ret = -E_SYNTAX;
+ get_database_dir_or_die();
if (conf.select_given)
ret = com_select();
else if (conf.create_given)
ERROR_LOG("%s\n", adu_strerror(-ret));
return -EXIT_FAILURE;
}
+ free(database_dir);
cmdline_parser_free(&conf);
select_cmdline_parser_free(&select_conf);
return EXIT_SUCCESS;