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

diff --git a/interactive.c b/interactive.c
index 4e4ccc7..61b4f29 100644
--- a/interactive.c
+++ b/interactive.c
@@ -1,28 +1,50 @@
+/*
+ * Copyright (C) 2008 Andre Noll <maan@tuebingen.mpg.de>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file interactive.c \brief Commands for interactive mode. */
+
 #include <ctype.h> /* isspace() */
 
 #include "adu.h"
 #include "format.h"
-#include "select.h"
+#include "user.h"
 #include "string.h"
-#include "error.h"
 #include "cmdline.h"
+#include "select.cmdline.h"
+#include "select.h"
+#include "error.h"
 
+/**
+ * Describes one valid command for interactive mode.
+ *
+ * When invoked in interactive mode, adu reads commands from stdin. There's a
+ * static array of all such commands.
+ */
 struct interactive_command {
+	/** The name of the command. */
 	const char *name;
+	/** Pointer to The function that is being executed. */
 	int (*handler)(char *);
+	/** Help text. */
 	const char *desc;
 };
 
 static struct uid_range *admissible_uids;
 static struct format_info *fi;
 
+/** The set of supported interactive commands. */
 #define INTERACTIVE_COMMANDS \
 	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 configuration")
+	INTERACTIVE_COMMAND(run, "start the query according to the current configuration") \
+	INTERACTIVE_COMMAND(source, "read and execute interactive commands from a file")
 
 
+/** \cond doxygen is not smart enough for this */
 #define INTERACTIVE_COMMAND(name, desc) \
 	static int icom_ ## name (char *line);
 
@@ -41,7 +63,9 @@ struct interactive_command icmds[] = {
 	INTERACTIVE_COMMANDS
 	{.name  = NULL}
 };
+/** \endcond */
 
+/** Iterate over the list of all interactive commands. */
 #define FOR_EACH_COMMAND(c) for (c = icmds; c->name; c++)
 
 static int read_input_line(char *line, size_t size)
@@ -63,19 +87,25 @@ static int icom_help(__a_unused char *line)
 	return 1;
 }
 
+/**
+ * Print the list of commands with short descriptions.
+ */
 void print_interactive_help(void)
 {
-	icom_help(NULL);
+	struct interactive_command *c;
+	FOR_EACH_COMMAND(c)
+		fprintf(stdout, "\t%s\t%s\n", c->name, c->desc);
 }
 
 static int icom_reset(__a_unused char *line)
 {
+	NOTICE_LOG("resetting configuration to default\n");
 	free_format_info(fi);
 	fi = NULL;
 	free(admissible_uids);
 	admissible_uids = NULL;
 	select_cmdline_parser_init(&select_conf);
-	return 1;
+	return parse_select_options(NULL, NULL, &admissible_uids, &fi);
 }
 
 static int icom_set(char *line)
@@ -99,6 +129,21 @@ static int icom_set(char *line)
 	return parse_select_options(line, &params, &admissible_uids, &fi);
 }
 
+/**
+ * Wrapper for isspace.
+ * NetBSD needs this.
+ */
+/*
+ * The values should be cast to an unsigned char first, then to int.
+ * Why? Because the isdigit (as do all other is/to functions/macros)
+ * expect a number from 0 upto and including 255 as their (int) argument.
+ * Because char is signed on most systems, casting it to int immediately
+ * gives the functions an argument between -128 and 127 (inclusive),
+ * which they will use as an array index, and which will thus fail
+ * horribly for characters which have their most significant bit set.
+ */
+#define adu_isspace(c) isspace((int)(unsigned char)(c))
+
 static int exec_interactive_command(char *line)
 {
 	const char const *delim = "\t\n\f\r\v ";
@@ -111,7 +156,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--;
 	}
@@ -121,6 +166,8 @@ static int exec_interactive_command(char *line)
 	if (!*line)
 		return 1;
 	/* OK, we have a non-empty line */
+	if (*line == '#')
+		return 1;
 	cmd = adu_strdup(line);
 	args = cmd + strcspn(cmd, delim);
 	if (!*args)
@@ -128,7 +175,7 @@ static int exec_interactive_command(char *line)
 	else {
 		*args = '\0';
 		args++;
-		/* let p point to the next non-whitespace char */
+		/* let args point to the next non-whitespace char */
 		args += strspn(args, delim);
 		if (!*args)
 			args = NULL;
@@ -145,17 +192,47 @@ static int exec_interactive_command(char *line)
 	return ret;
 }
 
+static int icom_source(char *args)
+{
+	char line[255];
+	FILE *src = fopen(args, "r");
+	int ret;
+
+	if (!src)
+		return -ERRNO_TO_ERROR(errno);
+	while (fgets(line, sizeof(line), src)) {
+		ret = exec_interactive_command(line);
+		if (ret < 0)
+			goto out;
+	}
+	ret = 1;
+out:
+	fclose(src);
+	return ret;
+}
+
+/**
+ * The main function for interactive mode.
+ *
+ * \return Standard.
+ */
 int com_interactive(void)
 {
 	char line[255];
-	int ret = 1;
+	int ret;
 
 	select_cmdline_parser_init(&select_conf);
 	ret = parse_select_options(NULL, NULL, &admissible_uids, &fi);
+	if (ret< 0)
+		return ret;
+	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;
 }