adu.ggo: Remove unused --config-file option.

[adu.git] / interactive.c

diff --git a/interactive.c b/interactive.c
index 08f700f7a6cd2d423d0a37e84e9ee09727536745..8f94076c4a8bb08829b482fd830e1820251f8243 100644 (file)
--- a/interactive.c
+++ b/interactive.c
@@ -110,7 +110,6 @@ static int icom_reset(__a_unused char *line)
 
 static int icom_set(char *line)
 {
-       int ret;
        struct select_cmdline_parser_params params = {
                .override = 1,
                .initialize = 0,
@@ -127,10 +126,7 @@ static int icom_set(char *line)
        fi = NULL;
        free(admissible_uids);
        admissible_uids = NULL;
-       ret = parse_select_options(line, &params, &admissible_uids, &fi);
-       if (ret >= 0)
-               return ret;
-       return icom_reset(NULL);
+       return parse_select_options(line, &params, &admissible_uids, &fi);
 }
 
 static int exec_interactive_command(char *line)
@@ -145,7 +141,7 @@ static int exec_interactive_command(char *line)
                return 1;
        len = strlen(line);
 
-       while (len && isspace(line[len - 1])) {
+       while (len && adu_isspace(line[len - 1])) {
                line[len - 1] = '\0';
                len--;
        }
@@ -214,13 +210,14 @@ int com_interactive(void)
        ret = parse_select_options(NULL, NULL, &admissible_uids, &fi);
        if (ret< 0)
                return ret;
-       ret = read_uid_file(conf.database_dir_arg);
+       ret = read_uid_file();
        if (ret < 0)
                return ret;
        while (read_input_line(line, sizeof(line)) >= 0) {
                ret = exec_interactive_command(line);
                if (ret < 0)
                        printf("%s\n", adu_strerror(-ret));
+               fflush(NULL);
        }
        return ret;
 }