X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=interactive.c;h=4e4ccc7417d0165581725c298ceb4bf6a06d1d30;hp=494a4f8760fabdc95db2a9213a2057194ca80a74;hb=f101e2eebec54c87f2675a8e2a57f3418a824b9b;hpb=e2fe978a3fa04160d60a4d39659f05798d356fab

diff --git a/interactive.c b/interactive.c
index 494a4f8..4e4ccc7 100644
--- a/interactive.c
+++ b/interactive.c
@@ -1,8 +1,11 @@
+#include <ctype.h> /* isspace() */
+
 #include "adu.h"
+#include "format.h"
+#include "select.h"
 #include "string.h"
 #include "error.h"
 #include "cmdline.h"
-#include "select.cmdline.h"
 
 struct interactive_command {
 	const char *name;
@@ -11,13 +14,13 @@ struct interactive_command {
 };
 
 static struct uid_range *admissible_uids;
+static struct format_info *fi;
 
 #define INTERACTIVE_COMMANDS \
-	INTERACTIVE_COMMAND(dump, "dump the current configuration") \
 	INTERACTIVE_COMMAND(set, "change the current configuration") \
 	INTERACTIVE_COMMAND(reset, "reset configuration to defaults") \
 	INTERACTIVE_COMMAND(help, "show list of commands and one-line descriptions") \
-	INTERACTIVE_COMMAND(run, "start the query according to the current options")
+	INTERACTIVE_COMMAND(run, "start the query according to the current configuration")
 
 
 #define INTERACTIVE_COMMAND(name, desc) \
@@ -48,7 +51,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, fi);
 }
 
 static int icom_help(__a_unused char *line)
@@ -60,8 +63,17 @@ 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)
 {
+	free_format_info(fi);
+	fi = NULL;
+	free(admissible_uids);
+	admissible_uids = NULL;
 	select_cmdline_parser_init(&select_conf);
 	return 1;
 }
@@ -75,35 +87,58 @@ static int icom_set(char *line)
 		.check_ambiguity = 0,
 		.print_errors = 1
 	};
-	if (select_cmdline_parser_string_ext(line, &select_conf, "select",
-		&params))
-		return -E_SYNTAX;
-	return parse_uid_arg(select_conf.uid_arg, &admissible_uids);
-}
+	if (!line) {
+		select_cmdline_parser_dump(stdout, &select_conf);
+		return 1;
+	}
 
-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;
+	free_format_info(fi);
+	fi = NULL;
+	free(admissible_uids);
+	admissible_uids = NULL;
+	return parse_select_options(line, &params, &admissible_uids, &fi);
 }
 
 static int exec_interactive_command(char *line)
 {
-	const char const *delim = "\t\n ";
+	const char const *delim = "\t\n\f\r\v ";
 	int i;
-	char *cmd = adu_strdup(line + strspn(line, delim));
-	char *p = cmd + strcspn(cmd, delim);
+	char *cmd, *args;
 	int ret = -E_SYNTAX;
+	size_t len;
+
+	if (!line || !*line)
+		return 1;
+	len = strlen(line);
 
-	*p = '\0';
-	p++;
+	while (len && isspace(line[len - 1])) {
+		line[len - 1] = '\0';
+		len--;
+	}
+	if (!len)
+		return 1;
+	line += strspn(line, delim); /* skip initial whitespace */
+	if (!*line)
+		return 1;
+	/* OK, we have a non-empty line */
+	cmd = adu_strdup(line);
+	args = cmd + strcspn(cmd, delim);
+	if (!*args)
+		args = NULL;
+	else {
+		*args = '\0';
+		args++;
+		/* let p point to the next non-whitespace char */
+		args += strspn(args, delim);
+		if (!*args)
+			args = NULL;
+	}
+	DEBUG_LOG("name: %s, args: %s.\n", cmd, args);
 	for (i = 0; icmds[i].name; i++) {
-		ERROR_LOG("name: %s, cmd: %s.\n", icmds[i].name, cmd);
 		if (strcmp(icmds[i].name, cmd))
 			continue;
-		ERROR_LOG("exec cmd: %s, args: %s\n", cmd, p);
-		ret = icmds[i].handler(p);
+		INFO_LOG("exec cmd: %s, args: %s\n", cmd, args);
+		ret = icmds[i].handler(args);
 		break;
 	}
 	free(cmd);
@@ -116,12 +151,8 @@ int com_interactive(void)
 	int ret = 1;
 
 	select_cmdline_parser_init(&select_conf);
+	ret = parse_select_options(NULL, NULL, &admissible_uids, &fi);
 	while (read_input_line(line, sizeof(line)) >= 0) {
-		size_t len = strlen(line);
-		if (!len)
-			continue;
-		if (line[len - 1] == '\n')
-			line[len - 1] = '\0';
 		ret = exec_interactive_command(line);
 		if (ret < 0)
 			printf("%s\n", adu_strerror(-ret));