X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.c;h=cbc42cb5769bc86b8e7c4ae214adaf781a63871e;hp=ed1b4fa32aee7dac5a7650f2074f8f37df2820d1;hb=c5a8fc5f5153f1d2859ddc4f4030c178d77eb726;hpb=e584cd6d5a3782ddeb6640f69534ab1664da2605

diff --git a/adu.c b/adu.c
index ed1b4fa..cbc42cb 100644
--- a/adu.c
+++ b/adu.c
@@ -106,6 +106,7 @@ static void close_dir_table(void)
 
 	if (!dir_table)
 		return;
+	NOTICE_LOG("closing dir table\n");
 	ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN));
 	if (ret < 0)
 		ERROR_LOG("failed to close dir table: %s\n", adu_strerror(-ret));
@@ -146,15 +147,20 @@ static int init_signals(void)
 
 int open_dir_table(int create)
 {
+
+	if (dir_table)
+		return 1;
 	dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
 
 	if (create) {
+		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;
 		}
 	}
+	INFO_LOG("opening dir table\n");
 	return osl(osl_open_table(&dir_table_desc, &dir_table));
 }
 
@@ -182,7 +188,6 @@ static int check_args(void)
 static int print_complete_help_and_die(void)
 {
 	const char **line;
-	select_cmdline_parser_init(&select_conf);
 
 	printf("%s-%s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION);
 	printf("%s\n\n", gengetopt_args_info_purpose);
@@ -205,6 +210,8 @@ static int print_complete_help_and_die(void)
 
 	printf("Interactive commands:\n");
 	print_interactive_help();
+	cmdline_parser_free(&conf);
+	select_cmdline_parser_free(&select_conf);
 	exit(EXIT_FAILURE);
 }
 
@@ -212,16 +219,19 @@ int main(int argc, char **argv)
 {
 	int ret;
 	struct cmdline_parser_params params = {
-		.override = 0,
+		.override = 1,
 		.initialize = 1,
 		.check_required = 0,
 		.check_ambiguity = 0,
 		.print_errors = 0
 	};
+	select_cmdline_parser_init(&select_conf);
+	cmdline_parser_init(&conf);
 	/* ignore errors and print complete help if --help was given */
 	cmdline_parser_ext(argc, argv, &conf, &params);
 	if (conf.help_given || conf.detailed_help_given)
 		print_complete_help_and_die();
+	cmdline_parser_free(&conf);
 	params.check_required = 1;
 	params.check_ambiguity = 1;
 	params.print_errors = 1;
@@ -245,9 +255,12 @@ int main(int argc, char **argv)
 	if (ret < 0)
 		goto out;
 out:
+	close_all_tables();
 	if (ret < 0) {
 		ERROR_LOG("%s\n", adu_strerror(-ret));
 		return -EXIT_FAILURE;
 	}
+	cmdline_parser_free(&conf);
+	select_cmdline_parser_free(&select_conf);
 	return EXIT_SUCCESS;
 }