X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=interactive.c;h=93e4a36b46e66a6481cc70afb91e562b0a26b5ff;hp=35b9b48026f69023254acc938ced5fb9badd414a;hb=fd37e9fafb8fd103b530ab45f0624fb5d67c0a89;hpb=3bccda3199f83f5fc128b5ae3c256df305d059bc

diff --git a/interactive.c b/interactive.c
index 35b9b48..93e4a36 100644
--- a/interactive.c
+++ b/interactive.c
@@ -1,5 +1,6 @@
-#include "format.h"
 #include "adu.h"
+#include "format.h"
+#include "select.h"
 #include "string.h"
 #include "error.h"
 #include "cmdline.h"
@@ -11,7 +12,7 @@ struct interactive_command {
 };
 
 static struct uid_range *admissible_uids;
-static struct select_format_info sfi;
+static struct format_info *fi;
 
 #define INTERACTIVE_COMMANDS \
 	INTERACTIVE_COMMAND(dump, "dump the current configuration") \
@@ -49,7 +50,7 @@ static int read_input_line(char *line, size_t size)
 
 static int icom_run(__a_unused char *line)
 {
-	return run_select_query(admissible_uids, &sfi);
+	return run_select_query(admissible_uids, fi);
 }
 
 static int icom_help(__a_unused char *line)
@@ -61,6 +62,11 @@ static int icom_help(__a_unused char *line)
 	return 1;
 }
 
+void print_interactive_help(void)
+{
+	icom_help(NULL);
+}
+
 static int icom_reset(__a_unused char *line)
 {
 	select_cmdline_parser_init(&select_conf);
@@ -76,12 +82,11 @@ static int icom_set(char *line)
 		.check_ambiguity = 0,
 		.print_errors = 1
 	};
-	return parse_select_options(line, &params, &admissible_uids, &sfi);
+	return parse_select_options(line, &params, &admissible_uids, &fi);
 }
 
 static int icom_dump(__a_unused char *line)
 {
-	ERROR_LOG("dump: %s\n", select_conf.format_arg);
 	select_cmdline_parser_dump(stdout, &select_conf);
 	return 1;
 }