X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=adu.c;h=7d8c9abd0191b6d4c84036bcc70e7e91d2cf03f3;hb=59af25aafd51b706ed67784aa84332965c31bb26;hp=cd77fd9f9f4741b7c9f805072737bc4216f1f36e;hpb=7c5fafb3a13d58cdfc96f90b74972f7d9f7adef1;p=adu.git

diff --git a/adu.c b/adu.c
index cd77fd9..7d8c9ab 100644
--- a/adu.c
+++ b/adu.c
@@ -5,6 +5,16 @@
  */
 
 /** \file adu.c \brief The main functions used by all modes of operation. */
+
+/**
+ * \mainpage adu API reference
+ *
+ * - Modes of operation: \ref select.c, \ref create.c, \ref interactive.c
+ * - User handling: \ref user.c
+ * - Error handling: \ref error.h
+ * - Library-type functions: \ref fd.c, \ref format.c, \ref string.c, \ref portable_io.h, \ref bloom.c
+ */
+
 #include "adu.h"
 #include <dirent.h> /* readdir() */
 #include <pwd.h>
@@ -17,10 +27,11 @@
 #include "string.h"
 #include "error.h"
 
+/** Define the array of error descriptions. */
 DEFINE_ERRLIST;
 
 /**
- * The error code of the last osl library function.
+ * The error code of the last called osl library function.
  *
  * \sa osl().
  */
@@ -35,6 +46,8 @@ struct gengetopt_args_info conf;
 /** 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.
@@ -172,21 +185,27 @@ static int init_signals(void)
  */
 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));
-		if (ret < 0) {
-			free((char *)dir_table_desc.dir);
-			return ret;
-		}
+		ret = osl(osl_create_table(&dir_table_desc));
+		if (ret < 0)
+			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)
@@ -210,7 +229,7 @@ static int check_args(void)
 	return 1;
 }
 
-static int print_complete_help_and_die(void)
+static void print_complete_help_and_die(void)
 {
 	const char **line;
 
@@ -240,6 +259,27 @@ static int print_complete_help_and_die(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.
  *
@@ -281,7 +321,7 @@ int main(int argc, char **argv)
 	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)
@@ -296,6 +336,7 @@ out:
 		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;