User handling improvments.

[adu.git] / interactive.c

diff --git a/interactive.c b/interactive.c
index 8b27c0c79837c733b9f2c056e27ed7d5e5c7097a..9460877e344e8f8452b0f0d20f1d6ceef83dd39e 100644 (file)
--- a/interactive.c
+++ b/interactive.c
@@ -1,22 +1,36 @@
+#include <ctype.h> /* isspace() */
+
 #include "adu.h"
+#include "format.h"
+#include "user.h"
 #include "string.h"
-#include "error.h"
-#include "cmdline.h"
 #include "select.cmdline.h"
+#include "select.h"
+#include "error.h"
 
-struct select_args_info select_conf;
-
+/**
+ * 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;
+
 #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 configuration")
 
 
 #define INTERACTIVE_COMMAND(name, desc) \
@@ -45,6 +59,11 @@ static int read_input_line(char *line, size_t size)
        return fgets(line, size, stdin)? 1 : -1;
 }
 
+static int icom_run(__a_unused char *line)
+{
+       return run_select_query(admissible_uids, fi);
+}
+
 static int icom_help(__a_unused char *line)
 {
        struct interactive_command *c;
@@ -54,14 +73,23 @@ static int icom_help(__a_unused char *line)
        return 1;
 }
 
+void print_interactive_help(void)
+{
+       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)
 {
+       free_format_info(fi);
+       fi = NULL;
+       free(admissible_uids);
+       admissible_uids = NULL;
        select_cmdline_parser_init(&select_conf);
        return 1;
 }
 
-static struct uid_range *admissible_uids;
-
 static int icom_set(char *line)
 {
        struct select_cmdline_parser_params params = {
@@ -71,35 +99,60 @@ 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 */
+       if (*line == '#')
+               return 1;
+       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);
@@ -111,12 +164,9 @@ int com_interactive(void)
        char line[255];
        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));