X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.c;h=68a48deea7a8a186511a1023fc7ee3bdba044977;hp=b227589dbbb8e5f467421178c1d78ae052e1efb0;hb=e505632b96561200b3d5d308b14b853d48952aab;hpb=d623adf133aaaee36091b840b8644c1884cd970c

diff --git a/adu.c b/adu.c
index b227589..68a48de 100644
--- a/adu.c
+++ b/adu.c
@@ -46,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.
@@ -183,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)
@@ -293,6 +301,11 @@ int main(int argc, char **argv)
 	if (ret < 0)
 		goto out;
 	ret = -E_SYNTAX;
+	if (conf.database_dir_given)
+		database_dir = adu_strdup(conf.database_dir_arg);
+	else
+		database_dir = make_message("%s%s",
+			conf.database_root_arg, conf.base_dir_arg);
 	if (conf.select_given)
 		ret = com_select();
 	else if (conf.create_given)
@@ -307,6 +320,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;