Import wordsplit as a submodule

* .gitmodules: New module: wordsplit
* Makefile.am: Distribute wordsplit files.
* am/grecs.m4 (GRECS_INCLUDES): Add wordsplit directory
* doc/Makefile.am (dist_man_MANS): Distribute wordsplit/wordsplit.3
* doc/wordsplit.3: Remove.
* include/Makefile.am (GRECS_HDR): Add wordsplit/wordsplit.
* include/wordsplit.h: Remove.
* src/Make-inst.am: Define nodist_libgrecs_la_SOURCES.
* src/Make-shared.am: Likewise.
* src/Make-static.am: Define nodist_libgrecs_a_SOURCES.
* src/Make.am (GRECS_SRC): Remove wordsplit.c
(NODIST_GRECS_SRC): Define to wordsplit.c
(VPATH): Add the wordsplit directory.
* src/wordsplit.c: Remove.
* tests/wordsplit.at: Remove.
* tests/wsp.c: Remove.
* tests/Makefile.am: Build separate testsuite for wordsplit. Use VPATH
to build wsp.
* tests/.gitignore: Update.

5 files changed, 11 insertions, 2897 deletions

diff --git a/src/Make-inst.am b/src/Make-inst.am
index a4b6aea..1eb04bb 100644
--- a/src/Make-inst.am
+++ b/src/Make-inst.am
@@ -1,3 +1,3 @@
 # This file is part of grecs - Gray's Extensible Configuration System
-# Copyright (C) 2007-2016 Sergey Poznyakoff
+# Copyright (C) 2007-2019 Sergey Poznyakoff
 #
@@ -21 +21,3 @@ m4datadir = $(datadir)/aclocal
 dist_m4data_DATA = libgrecs.m4
+nodist_libgrecs_la_SOURCES = $(NODIST_GRECS_SRC)
+
diff --git a/src/Make-shared.am b/src/Make-shared.am
index 9a762a4..f080e46 100644
--- a/src/Make-shared.am
+++ b/src/Make-shared.am
@@ -1,3 +1,3 @@
 # This file is part of grecs - Gray's Extensible Configuration System
-# Copyright (C) 2007-2016 Sergey Poznyakoff
+# Copyright (C) 2007-2019 Sergey Poznyakoff
 #
@@ -18,2 +18,3 @@ noinst_LTLIBRARIES=libgrecs.la
 libgrecs_la_SOURCES = $(GRECS_SRC)
+nodist_libgrecs_la_SOURCES = $(NODIST_GRECS_SRC)
 
diff --git a/src/Make-static.am b/src/Make-static.am
index 2688b40..1f4cd3e 100644
--- a/src/Make-static.am
+++ b/src/Make-static.am
@@ -1,3 +1,3 @@
 # This file is part of grecs - Gray's Extensible Configuration System
-# Copyright (C) 2007-2016 Sergey Poznyakoff
+# Copyright (C) 2007-2019 Sergey Poznyakoff
 #
@@ -18,2 +18,3 @@ noinst_LIBRARIES=libgrecs.a
 libgrecs_a_SOURCES = $(GRECS_SRC)
+nodist_libgrecs_a_SOURCES = $(NODIST_GRECS_SRC)
 
diff --git a/src/Make.am b/src/Make.am
index 9fa7688..5199991 100644
--- a/src/Make.am
+++ b/src/Make.am
@@ -1,3 +1,3 @@
 # This file is part of grecs - Gray's Extensible Configuration System
-# Copyright (C) 2007-2016 Sergey Poznyakoff
+# Copyright (C) 2007-2019 Sergey Poznyakoff
 #
@@ -71,3 +71,2 @@ GRECS_SRC = \
  version.c\
- wordsplit.c\
  $(GRECS_JSON)\
@@ -78,2 +77,5 @@ GRECS_SRC = \
 
+VPATH += $(top_srcdir)/@GRECS_SUBDIR@/wordsplit
+NODIST_GRECS_SRC = wordsplit.c
+
 if GRECS_COND_SOCKADDR_LIST
diff --git a/src/wordsplit.c b/src/wordsplit.c
deleted file mode 100644
index 9179a87..0000000
--- a/src/wordsplit.c
+++ /dev/null
@@ -1,2892 +0,0 @@
-/* wordsplit - a word splitter
-   Copyright (C) 2009-2019 Sergey Poznyakoff
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3 of the License, or (at your
-   option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <errno.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <pwd.h>
-#include <glob.h>
-#include <limits.h>
-
-#if ENABLE_NLS
-# include <gettext.h>
-#else
-# define gettext(msgid) msgid
-#endif
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-#include <wordsplit.h>
-
-#define ISWS(c) ((c)==' '||(c)=='\t'||(c)=='\n')
-#define ISDELIM(ws,c) \
-  (strchr ((ws)->ws_delim, (c)) != NULL)
-#define ISPUNCT(c) (strchr("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",(c))!=NULL)
-#define ISUPPER(c) ('A' <= ((unsigned) (c)) && ((unsigned) (c)) <= 'Z')
-#define ISLOWER(c) ('a' <= ((unsigned) (c)) && ((unsigned) (c)) <= 'z')
-#define ISALPHA(c) (ISUPPER(c) || ISLOWER(c))
-#define ISDIGIT(c) ('0' <= ((unsigned) (c)) && ((unsigned) (c)) <= '9')
-#define ISXDIGIT(c) (strchr("abcdefABCDEF", c)!=NULL)
-#define ISALNUM(c) (ISALPHA(c) || ISDIGIT(c))
-#define ISPRINT(c) (' ' <= ((unsigned) (c)) && ((unsigned) (c)) <= 127)
-
-#define ISVARBEG(c) (ISALPHA(c) || c == '_')
-#define ISVARCHR(c) (ISALNUM(c) || c == '_')
-
-#define WSP_RETURN_DELIMS(wsp) \
- ((wsp)->ws_flags & WRDSF_RETURN_DELIMS || ((wsp)->ws_options & WRDSO_MAXWORDS))
-
-#define to_num(c) \
-  (ISDIGIT(c) ? c - '0' : (ISXDIGIT(c) ? toupper(c) - 'A' + 10 : 255 ))
-
-#define ALLOC_INIT 128
-#define ALLOC_INCR 128
-
-static void
-_wsplt_alloc_die (struct wordsplit *wsp)
-{
-  wsp->ws_error ("%s", _("memory exhausted"));
-  abort ();
-}
-
-static void
-_wsplt_error (const char *fmt, ...)
-{
-  va_list ap;
-
-  va_start (ap, fmt);
-  vfprintf (stderr, fmt, ap);
-  va_end (ap);
-  fputc ('\n', stderr);
-}
-
-static void wordsplit_free_nodes (struct wordsplit *);
-
-static int
-_wsplt_seterr (struct wordsplit *wsp, int ec)
-{
-  wsp->ws_errno = ec;
-  if (wsp->ws_flags & WRDSF_SHOWERR)
-    wordsplit_perror (wsp);
-  return ec;
-}
-
-static int
-_wsplt_nomem (struct wordsplit *wsp)
-{
-  errno = ENOMEM;
-  wsp->ws_errno = WRDSE_NOSPACE;
-  if (wsp->ws_flags & WRDSF_ENOMEMABRT)
-    wsp->ws_alloc_die (wsp);
-  if (wsp->ws_flags & WRDSF_SHOWERR)
-    wordsplit_perror (wsp);
-  if (!(wsp->ws_flags & WRDSF_REUSE))
-    wordsplit_free (wsp);
-  wordsplit_free_nodes (wsp);
-  return wsp->ws_errno;
-}
-
-static void
-_wsplt_store_errctx (struct wordsplit *wsp, char const *str, size_t len)
-{
-  free (wsp->ws_errctx);
-  wsp->ws_errctx = malloc (len + 1);
-  if (!wsp->ws_errctx)
-    {
-      wsp->ws_error ("%s",
-                     _("memory exhausted while trying to store error context"));
-    }
-  else
-    {
-      memcpy (wsp->ws_errctx, str, len);
-      wsp->ws_errctx[len] = 0;
-    }
-}
-
-static inline int
-_wsplt_setctxerr (struct wordsplit *wsp, int ec, char const *str, size_t len)
-{
-  _wsplt_store_errctx (wsp, str, len);
-  return _wsplt_seterr (wsp, ec);
-}
-
-static int wordsplit_run (const char *command, size_t length,
-                          struct wordsplit *wsp,
-                          int flags, int lvl);
-
-static int wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
-                           int flags);
-static int wordsplit_process_list (struct wordsplit *wsp, size_t start);
-static int wordsplit_finish (struct wordsplit *wsp);
-
-static int
-_wsplt_subsplit (struct wordsplit *wsp, struct wordsplit *wss,
-                 char const *str, int len,
-                 int flags, int finalize)
-{
-  int rc;
-
-  wss->ws_delim = wsp->ws_delim;
-  wss->ws_debug = wsp->ws_debug;
-  wss->ws_error = wsp->ws_error;
-  wss->ws_alloc_die = wsp->ws_alloc_die;
-
-  if (!(flags & WRDSF_NOVAR))
-    {
-      wss->ws_env = wsp->ws_env;
-      wss->ws_getvar = wsp->ws_getvar;
-      flags |= wsp->ws_flags & (WRDSF_ENV | WRDSF_ENV_KV | WRDSF_GETVAR);
-    }
-  if (!(flags & WRDSF_NOCMD))
-    {
-      wss->ws_command = wsp->ws_command;
-    }
-
-  if ((flags & (WRDSF_NOVAR|WRDSF_NOCMD)) != (WRDSF_NOVAR|WRDSF_NOCMD))
-    {
-      wss->ws_closure = wsp->ws_closure;
-      flags |= wsp->ws_flags & WRDSF_CLOSURE;
-    }
-
-  wss->ws_options = wsp->ws_options;
-
-  flags |= WRDSF_DELIM
-         | WRDSF_ALLOC_DIE
-         | WRDSF_ERROR
-         | WRDSF_DEBUG
-         | (wsp->ws_flags & (WRDSF_SHOWDBG | WRDSF_SHOWERR | WRDSF_OPTIONS));
-
-  rc = wordsplit_init (wss, str, len, flags);
-  if (rc)