X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=interactive.c;h=036f7a84d1a861eb0a48b21583854cb6fe0a068a;hb=de525e7c5b6592b41f8681f919d5d53406801861;hp=2a59e79dbd62a17dc60e547054cb0a97035f8121;hpb=b6077bec588bd4a699f499acdab59bda8137718e;p=adu.git diff --git a/interactive.c b/interactive.c index 2a59e79..036f7a8 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) @@ -76,7 +77,7 @@ static int icom_set(char *line) .check_ambiguity = 0, .print_errors = 1 }; - return parse_select_options(line, ¶ms, &admissible_uids, &sfi); + return parse_select_options(line, ¶ms, &admissible_uids, &fi); } static int icom_dump(__a_unused char *line)