18 files changed, 76 insertions, 6041 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ec3950b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "wordsplit"]
+        path = wordsplit
+        url = git://git.gnu.org.ua/wordsplit.git
diff --git a/Makefile.am b/Makefile.am
index 3eaa8df..b8482a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of Grecs
-# Copyright (C) 2007-2016 Sergey Poznyakoff
+# Copyright (C) 2007-2019 Sergey Poznyakoff
 #
 # Grecs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,9 @@
 
 ACLOCAL_AMFLAGS = -I am
 SUBDIRS=. include src @GRECS_TESTDIR@ @GRECS_DOCDIR@
-EXTRA_DIST=build-aux/yyrename @GRECS_BUILD_AUX@ @GRECS_DISTDOC@ gitid.h
+EXTRA_DIST=build-aux/yyrename @GRECS_BUILD_AUX@ @GRECS_DISTDOC@ gitid.h\
+  wordsplit/wordsplit.c wordsplit/wordsplit.h wordsplit/wordsplit.3 \
+  wordsplit/wordsplit.at wordsplit/wsp.c
 
 noinst_HEADERS = gitid.h
 BUILT_SOURCES = gitid.h README
diff --git a/am/grecs.m4 b/am/grecs.m4
index 33a6809..8bf3d21 100644
--- a/am/grecs.m4
+++ b/am/grecs.m4
@@ -1,5 +1,5 @@
 # This file is part of grecs - Gray's Extensible Configuration System -*- autoconf -*-
-# Copyright (C) 2007-2016 Sergey Poznyakoff
+# Copyright (C) 2007-2019 Sergey Poznyakoff
 #
 # Grex is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -202,7 +202,7 @@ AC_DEFUN([GRECS_SETUP],[
   AC_SUBST([GRECS_CHANGELOG])
   AC_SUBST([GRECS_DISTCK_AT])
   AC_SUBST([GRECS_README])
-  AC_SUBST([GRECS_INCLUDES],['-I$(top_srcdir)/]grecsdir[include] [-I$(top_builddir)/]grecsdir[include]')
+  AC_SUBST([GRECS_INCLUDES],['-I$(top_srcdir)/]grecsdir[include] [-I$(top_srcdir)/]grecsdir[wordsplit] [-I$(top_builddir)/]grecsdir[include]')
   AC_SUBST([GRECS_HOST_PROJECT_INCLUDES])
   AC_SUBST([GRECS_HOST_PROJECT_LDADD])
   AC_SUBST([GRECS_DISTDOC])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a646367..009537d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of grecs - Gray's Extensible Configuration System
-# Copyright (C) 2007-2016 Sergey Poznyakoff
+# Copyright (C) 2007-2019 Sergey Poznyakoff
 #
 # Grecs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,5 +29,5 @@ dist_man_MANS = \
  grecs_parse.3\
  grecs_stmt_path.5\
  grecs_strdup.3\
- grecs_tree_free.3
-
+ grecs_tree_free.3\
+ $(top_srcdir)/@GRECS_SUBDIR@/wordsplit/wordsplit.3
diff --git a/doc/wordsplit.3 b/doc/wordsplit.3
deleted file mode 100644
index 1a6f80b..0000000
--- a/doc/wordsplit.3
+++ /dev/null
@@ -1,1036 +0,0 @@
-.\" This file is part of grecs -*- nroff -*-
-.\" Copyright (C) 2007-2018 Sergey Poznyakoff
-.\"
-.\" Grecs 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, or (at your option)
-.\" any later version.
-.\"
-.\" Grecs 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 Grecs.  If not, see <http://www.gnu.org/licenses/>.
-.\"
-.TH WORDSPLIT 3 "May 22, 2018" "GRECS" "Grecs User Reference"
-.SH NAME
-wordsplit \- split string into words 
-.SH SYNOPSIS
-.B #include <wordsplit.h>
-.sp
-\fBint wordsplit (const char *\fIs\fB,\
- wordsplit_t *\fIws\fB, int \fIflags\fB);\fR
-.sp
-\fBint wordsplit_len (const char *\fIs\fB,\
- \fBsize_t \fIlen\fR,\
- \fBwordsplit_t *\fIp\fB,\
- int \fIflags\fB);
-.sp 
-\fBvoid wordsplit_free (wordsplit_t *\fIp\fB);\fR
-.sp
-\fBvoid wordsplit_free_words (wordsplit_t *\fIws\fB);\fR
-.sp
-\fBvoid wordsplit_getwords (wordsplit_t *\fIws\fB,\
- int *\fIwordc\fB, char ***\fIwordv\fB);
-.sp
-\fBvoid wordsplit_perror (wordsplit_t *\fIws\fB);\fR
-.sp
-\fBconst char *wordsplit_strerror (wordsplit_t *\fIws\fB);\fR
-.sp
-\fBvoid wordsplit_clearerr (wordsplit_t *\fIws\fB);\fR
-.SH DESCRIPTION
-The function \fBwordsplit\fR splits the string \fIs\fR into words
-using a set of rules governed by \fIflags\fR.  Depending on
-\fIflags\fR, the function performs the following operations:
-whitespace trimming, tilde expansion, variable expansion, quote
-removal, command substitution, and path expansion.  On success,
-\fBwordsplit\fR returns 0 and stores the words found in the member
-\fBws_wordv\fR and the number of words in the member \fBws_wordc\fR.
-On error, a non-zero error code is returned.
-.PP
-The function \fBwordsplit_len\fR acts similarly, except that it
-accesses only first \fBlen\fR bytes of the string \fIs\fR, which is
-not required to be null-terminated.
-.PP
-When no longer needed, the resources allocated by a call to one of
-these functions must be freed using
-.BR wordsplit_free .
-.PP
-The function
-.B wordsplit_free_words
-frees only the memory allocated for elements of
-.I ws_wordv
-and initializes 
-.I ws_wordc
-to zero.
-.PP
-The usual calling sequence is:
-.PP
-.EX
-wordsplit_t ws;
-int rc;
-
-if (wordsplit(s, &ws, WRDSF_DEFFLAGS)) {
-    wordsplit_perror(&ws);
-    return;
-}
-for (i = 0; i < ws.ws_wordc; i++) {
-    /* do something with ws.ws_wordv[i] */
-}
-wordsplit_free(&ws);
-.EE
-.PP
-The function
-.B wordsplit_getwords
-returns in \fIwordv\fR an array of words, and in \fIwordc\fR the number
-of elements in \fIwordv\fR.  The array can be used after calling
-.BR wordsplit_free .
-The caller becomes responsible for freeing the memory allocated for
-each element of the array and the array pointer itself.
-.PP
-The function
-.B wordsplit_perror
-prints error message from the last invocation of \fBwordsplit\fR.  It
-uses the function pointed to by the
-.I ws_error
-member.  By default, it outputs the message on the standard error.
-.PP
-For more sophisticated error reporting, the function
-.B wordsplit_strerror
-can be used.  It returns a pointer to the string describing the error.
-The caller should treat this pointer as a constant string.  It should
-not try to alter or deallocate it.
-.PP
-The function
-.B wordsplit_clearerr
-clears the error condition associated with \fIws\fR.
-.SH INCREMENTAL MODE
-In incremental mode \fBwordsplit\fR parses one word per invocation.
-It returns \fBWRDSF_OK\fR on success and \fBWRDSF_NOINPUT\fR when 
-entire input string has been processed.
-.PP
-This mode is enabled if the flag \fBWRDSF_INCREMENTAL\fR is set in
-the \fIflags\fR argument.  Subsequent calls to \fBwordsplit\fR must
-have \fBNULL\fR as first argument.  Each successful
-call will return exactly one word in \fBws.ws_wordv[0]\fR.
-.PP
-An example usage:
-.PP
-.EX
-wordsplit_t ws;
-int rc;
-flags = WRDSF_DEFFLAGS|WRDSF_INCREMENTAL;
-
-for (rc = wordsplit(s, &ws, flags); rc == WRDSF_OK;
-     rc = wordsplit(NULL, &ws, flags)) {
-     process(ws.ws_wordv[0]);
-}     
-
-if (rc != WRDSE_NOINPUT)
-     wordsplit_perror(&ws);
-
-wordsplit_free(&ws);
-.EE
-.SH OPTIONS
-The number of flags is limited to 32 (the width of \fBuint32_t\fR data
-type) and each bit is occupied by a corresponding flag. However, the
-number of features \fBwordsplit\fR provides required still
-more. Additional features can be requested by setting a corresponding
-\fIoption bit\fR in the \fBws_option\fR field of the \fBstruct
-wordsplit\fR argument. To inform wordsplit functions that this field
-is initialized the \fBWRDSF_OPTIONS\fR flag must be set.
-.PP
-Option symbolic names begin with \fBWRDSO_\fR. They are discussed in
-detail in the subsequent chapters.
-.SH EXPANSION
-Expansion is performed on the input after it has been split into
-words. There are several kinds of expansion, which of them are
-performed is controlled by appropriate bits set in the \fIflags\fR