X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=interactive.c;h=8f94076c4a8bb08829b482fd830e1820251f8243;hp=08f700f7a6cd2d423d0a37e84e9ee09727536745;hb=f56aa749790691ac3a44cc9c67a0ee7055939f78;hpb=c7d5ddb6906ab8a18181fee29ac78d604db5fdb9

diff --git a/interactive.c b/interactive.c
index 08f700f..8f94076 100644
--- 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;
 }