1 files changed, 444 insertions, 388 deletions

diff --git a/tests/wsp.c b/tests/wsp.c
index bd13e63..958d01f 100644
--- a/tests/wsp.c
+++ b/tests/wsp.c
@@ -1,3 +1,3 @@
 /* grecs - Gray's Extensible Configuration System
-   Copyright (C) 2014-2016 Sergey Poznyakoff
+   Copyright (C) 2014-2019 Sergey Poznyakoff
 
@@ -31,62 +31,180 @@ char *progname;
 
-struct kwd
+/* Global options */
+enum
+  {
+    TRIMNL_OPTION    = 0x01,   /* Remove trailing newline */
+    PLAINTEXT_OPTION = 0x02    /* Print intput verbatim (no escapes) */
+  };
+
+/* Environment types */
+enum env_type
+  {
+    env_none,                  /* No environment */
+    env_null,                  /* Null environment */
+    env_sys                    /* Use system environment */
+  };
+
+struct wsclosure
 {
-  const char *name;
-  int tok;
+  int options;            /* Global options */
+  struct wordsplit ws;    /* The wordsplit structure */
+  int wsflags;            /* Wordsplit flags */
+  enum env_type env_type; /* Environment type */
+  int offarg;             /* Index of the first of the initial words in
+                             the argv array. The ws.ws_dooffs field gives
+                             the number of such variables. Forces the
+                             WRDSF_DOOFFS flag. */
+  char **fenvbase;        /* Environment for testing the ws_getenv function */
+  int fenvidx;            /* Number of variables in fenvbase */
+  int fenvmax;            /* Size of fenbase (entries) */
+  int append_start;       /* First argument to append (index in argv) */
+  int append_count;       /* Number of arguments to append */
 };
 
-struct kwd bool_keytab[] = {
-  { "append", WRDSF_APPEND },
-  /*{ "reuse",  WRDSF_REUSE },*/
-  { "undef",  WRDSF_UNDEF },
-  { "novar",  WRDSF_NOVAR },
-  { "nocmd",  WRDSF_NOCMD },
-  { "ws",     WRDSF_WS },
-  { "quote",  WRDSF_QUOTE },
-  { "squote", WRDSF_SQUOTE },
-  { "dquote", WRDSF_DQUOTE },
-  { "squeeze_delims", WRDSF_SQUEEZE_DELIMS },
-  { "return_delims",  WRDSF_RETURN_DELIMS },
-  { "sed",     WRDSF_SED_EXPR },
-  { "debug",   WRDSF_SHOWDBG },
-  { "nosplit",  WRDSF_NOSPLIT },
-  { "keepundef", WRDSF_KEEPUNDEF },
-  { "warnundef", WRDSF_WARNUNDEF },
-  { "cescapes", WRDSF_CESCAPES },
-  { "default", WRDSF_DEFFLAGS },
-  { "env_kv", WRDSF_ENV_KV },
-  { "incremental", WRDSF_INCREMENTAL },
-  { "pathexpand", WRDSF_PATHEXPAND },
-  { NULL, 0 }
-};
+/* Command line option types */
+enum
+  {
+    ws_no_argument,       /* Option requires no arguments */
+    ws_boolean,           /* Option is boolean (can be prefixed with -no) */
+    ws_required_argument, /* Option requires one argument */
+    ws_multiple_arguments /* Option takes multiple arguments, terminated with
+                             "--" or end of argument list */
+  };
 
-struct kwd opt_keytab[] = {
-  { "nullglob",     WRDSO_NULLGLOB },
-  { "failglob",     WRDSO_FAILGLOB },
-  { "dotglob",      WRDSO_DOTGLOB },
-  { "bskeep_words", WRDSO_BSKEEP_WORD },
-  { "bskeep_quote", WRDSO_BSKEEP_QUOTE },
-  { "bskeep",       WRDSO_BSKEEP_WORD|WRDSO_BSKEEP_QUOTE },
-  { "novarsplit",   WRDSO_NOVARSPLIT },
-  { "nocmdsplit",   WRDSO_NOCMDSPLIT },
-  { NULL, 0 }
+/* Structure describing a single command-line option */
+struct wsopt
+{
+  const char *name;    /* Option name */
+  int tok;             /* Corresponding flag */
+  int arg;             /* Option type (see the enum above) */
+  void (*setfn) (int tok, int neg, char *arg, struct wsclosure *wsc);
+                       /* Setter function */
 };
 
-struct kwd string_keytab[] = {
-  { "delim",   WRDSF_DELIM },
-  { "comment", WRDSF_COMMENT },
-  { "escape",  WRDSF_ESCAPE },
-  { NULL, 0 }
-};
+/* Index of the next argument in the argv */
+static int wsoptind = -1;
 
+/* Parse next argument from the command line. Return EOF on end of arguments
+   or when the "--" argument is seen. */
 static int
-kwxlat (struct kwd *kwp, const char *str, int *res)
+getwsopt (int argc, char **argv, struct wsopt *wso, struct wsclosure *wsc)
 {
-  for (; kwp->name; kwp++)
-    if (strcmp (kwp->name, str) == 0)
-      {
-        *res = kwp->tok;
-        return 0;
-      }
-  return -1;
+  int negate = 0;
+  char *opt;
+
+  if (wsoptind == -1)
+    wsoptind = 1;
+  if (wsoptind == argc)
+    return EOF;
+
+  opt = argv[wsoptind++];
+  if (strcmp (opt, "--") == 0)
+    return EOF;
+  if (*opt != '-')
+    {
+      if (strchr (opt, '='))
+        {
+          assert (wsc->fenvidx < wsc->fenvmax - 1);
+          wsc->fenvbase[wsc->fenvidx++] = opt;
+          return 0;
+        }
+      wsoptind--;
+      return EOF;
+    }
+  opt++; /* skip past initial dash */
+  if (strncmp (opt, "no-", 3) == 0)
+    {
+      negate = 1;
+      opt += 3;
+    }
+  else if (strncmp (opt, "no", 2) == 0)
+    {
+      negate = 1;
+      opt += 2;
+    }
+  
+  for (; wso->name; wso++)
+    {
+      if (wso->arg == ws_boolean && wso->name[0] == 'n' && wso->name[1] == 'o'
+          && strcmp (wso->name + 2, opt) == 0)
+        {
+          negate ^= 1;
+          break;
+        }
+      if (strcmp (wso->name, opt) == 0)
+        break;
+    }
+
+  if (wso->name)
+    {
+      char *arg;
+      if (wso->arg == ws_multiple_arguments)
+        {
+          while (1)
+            {
+              if (wsoptind == argc)
+                break;
+              arg = argv[wsoptind++];
+              if (strcmp (arg, "--") == 0)
+                break;
+              wso->setfn (wso->tok, negate, arg, wsc);
+            }
+        }
+      else
+        {
+          if (wso->arg == ws_required_argument)
+            {
+              if (wsoptind == argc)
+                {
+                  fprintf (stderr, "%s: missing arguments for -%s\n",
+                           progname, opt);
+                  exit (1);
+                }
+              arg = argv[wsoptind++];
+            }
+          wso->setfn (wso->tok, negate, arg, wsc);
+        }
+      return 0;
+    }
+
+  fprintf (stderr, "%s: unrecognized option: -%s\n",
+           progname, opt);
+  fprintf (stderr, "%s: try %s -help for more detail\n",
+           progname, progname);
+  exit (1);
+}
+
+/* Setter functions for various options */
+
+static void
+setfn_flag (int flag, int neg, char *arg, struct wsclosure *wsc)
+{
+  if (neg)
+    wsc->wsflags &= ~flag;
+  else
+    wsc->wsflags |= flag;
+}
+
+static void
+setfn_option (int flag, int neg, char *arg, struct wsclosure *wsc)
+{
+  wsc->wsflags |= WRDSF_OPTIONS;
+  if (neg)
+    wsc->ws.ws_options &= ~flag;
+  else
+    wsc->ws.ws_options |= flag;
+}
+
+static void
+setfn_delim (int flag, int neg, char *arg, struct wsclosure *wsc)
+{
+  wsc->wsflags |= flag;
+  wsc->ws.ws_delim = arg;
+}
+
+static void
+setfn_comment (int flag, int neg, char *arg, struct wsclosure *wsc)
+{
+  wsc->wsflags |= flag;
+  wsc->ws.ws_comment = arg;
 }
@@ -94,3 +212,195 @@ kwxlat (struct kwd *kwp, const char *str, int *res)
 static void
-help ()
+set_escape_string (wordsplit_t *ws, int *wsflags, int q, const char *str)
+{
+  if (*str == ':')
+    {
+      while (*++str != ':')
+        {
+          int f;
+          switch (*str)
+            {
+            case '+':
+              f = WRDSO_BSKEEP;
+              break;
+
+            case '0':
+              f = WRDSO_OESC;
+              break;