X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=interactive.c;h=2a59e79dbd62a17dc60e547054cb0a97035f8121;hb=8033c743e9d07be7b79277e15b477e19f7e83d87;hp=295be371b384cd102534914f4c4a0903a89ddab2;hpb=1f948aa655d9a7389477baa1489f86e548ec064e;p=adu.git diff --git a/interactive.c b/interactive.c index 295be37..2a59e79 100644 --- a/interactive.c +++ b/interactive.c @@ -1,3 +1,4 @@ +#include "format.h" #include "adu.h" #include "string.h" #include "error.h" @@ -10,6 +11,7 @@ struct interactive_command { }; static struct uid_range *admissible_uids; +static struct select_format_info sfi; #define INTERACTIVE_COMMANDS \ INTERACTIVE_COMMAND(dump, "dump the current configuration") \ @@ -47,7 +49,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); + return run_select_query(admissible_uids, &sfi); } static int icom_help(__a_unused char *line) @@ -74,12 +76,11 @@ static int icom_set(char *line) .check_ambiguity = 0, .print_errors = 1 }; - return parse_select_options(line, ¶ms, &admissible_uids); + return parse_select_options(line, ¶ms, &admissible_uids, &sfi); } 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; }