14 files changed, 164 insertions, 4078 deletions

diff --git a/.gitmodules b/.gitmodules
index bdc2cb048..142e50cfd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "gnulib"]
         path = gnulib
         url = git://git.sv.gnu.org/gnulib.git
+[submodule "libmailutils/wordsplit"]
+        path = libmailutils/wordsplit
+        url = git://git.gnu.org.ua/wordsplit.git
diff --git a/NEWS b/NEWS
index 6928a7d48..6b16f1706 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ See the end of file for copying conditions.
 
 Please send mailutils bug reports to <bug-mailutils@gnu.org>.
 
+Version 3.7.90 (git)
+
 Version 3.7 - 2019-06-21
 
 * Support for the new mailbox format - dotmail
diff --git a/configure.ac b/configure.ac
index eb1436173..c841acfbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License along
 dnl with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.63)
-AC_INIT([GNU Mailutils], [3.7], [bug-mailutils@gnu.org], [mailutils],
+AC_INIT([GNU Mailutils], [3.7.90], [bug-mailutils@gnu.org], [mailutils],
         [http://mailutils.org])
 AC_CONFIG_SRCDIR([libmailutils/mailbox/mailbox.c])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -115,6 +115,8 @@ AC_CHECK_TYPE(iconv_t,:,
 #
 AC_CONFIG_LINKS(include/gettext.h:lib/gnu/gettext.h)
 
+AC_CONFIG_LINKS(include/mailutils/sys/wordsplit.h:libmailutils/wordsplit/wordsplit.h)
+
 AH_BOTTOM([
 #define DEFAULT_TEXT_DOMAIN PACKAGE
 ])
diff --git a/include/mailutils/sys/Makefile.am b/include/mailutils/sys/Makefile.am
index 7f31291a2..321c5f134 100644
--- a/include/mailutils/sys/Makefile.am
+++ b/include/mailutils/sys/Makefile.am
@@ -62,7 +62,8 @@ sysinclude_HEADERS = \
  temp_file_stream.h\
  tls-stream.h\
  url.h\
- xscript-stream.h
+ xscript-stream.h\
+ $(top_srcdir)/libmailutils/wordsplit/wordsplit.h
 
 BUILT_SOURCES = debcat.h
 
diff --git a/include/mailutils/sys/wordsplit.h b/include/mailutils/sys/wordsplit.h
new file mode 120000
index 000000000..5c46e03d2
--- /dev/null
+++ b/include/mailutils/sys/wordsplit.h
@@ -0,0 +1 @@
+../../../libmailutils/wordsplit/wordsplit.h
\ No newline at end of file
diff --git a/include/mailutils/wordsplit.h b/include/mailutils/wordsplit.h
index d5631ddba..203d92458 100644
--- a/include/mailutils/wordsplit.h
+++ b/include/mailutils/wordsplit.h
@@ -1,261 +1,121 @@
-/* wordsplit - a word splitter
-   Copyright (C) 2009-2018 Sergey Poznyakoff
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
-   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.
+   GNU Mailutils 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.
 
-   This program is distributed in the hope that it will be useful,
+   GNU Mailutils 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/>. */
+   You should have received a copy of the GNU General Public License
+   along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
+
+/* This header converts wordsplit to mailutils namespace by prefixing each
+   exported identifier with mu_ (or MU_, for macros).
+   The canonical wordsplit.h header is located in mailutils/sys.
+*/
 
 #ifndef __MAILUTILS_WORDSPLIT_H
 #define __MAILUTILS_WORDSPLIT_H
 
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct mu_wordsplit mu_wordsplit_t;
-
-/* Structure used to direct the splitting.  Members marked with [Input]
-   can be defined before calling mu_wordsplit(), those marked with [Output]
-   provide return values when the function returns.  If neither mark is
-   used, the member is internal and must not be used by the caller.
-
-   In the comments below, the
-   identifiers in parentheses indicate bits that must be set (or unset, if
-   starting with !) in the ws_flags to initialize or use the given member.
-   If not redefined explicitly, most of them are set to some reasonable
-   default value upon entry to mu_wordsplit(). */
-struct mu_wordsplit            
-{
-  size_t ws_wordc;          /* [Output] Number of words in ws_wordv. */
-  char **ws_wordv;          /* [Output] Array of parsed out words. */
-  size_t ws_offs;           /* [Input] (MU_WRDSF_DOOFFS) Number of initial
-                               elements in ws_wordv to fill with NULLs. */
-  size_t ws_wordn;          /* Number of elements ws_wordv can accomodate. */ 
-  int ws_flags;             /* [Input] Flags passed to mu_wordsplit. */
-  int ws_options;           /* [Input] (MU_WRDSF_PATHEXPAND)
-                               Additional options. */
-  const char *ws_delim;     /* [Input] (MU_WRDSF_DELIM) Word delimiters. */
-  const char *ws_comment;   /* [Input] (MU_WRDSF_COMMENT) Comment characters. */
-  const char *ws_escape[2]; /* [Input] (MU_WRDSF_ESCAPE) Characters to be escaped
-                               with backslash. */
-  void (*ws_alloc_die) (mu_wordsplit_t *wsp);
-                            /* [Input] (MU_WRDSF_ALLOC_DIE) Function called when
-                               out of memory.  Must not return. */
-  void (*ws_error) (const char *, ...)
-                   __attribute__ ((__format__ (__printf__, 1, 2)));
-                            /* [Input] (MU_WRDSF_ERROR) Function used for error
-                               reporting */
-  void (*ws_debug) (const char *, ...)
-                   __attribute__ ((__format__ (__printf__, 1, 2)));
-                            /* [Input] (MU_WRDSF_DEBUG) Function used for debug
-                               output. */
-  const char **ws_env;      /* [Input] (MU_WRDSF_ENV, !MU_WRDSF_NOVAR) Array of
-                               environment variables. */
+# define wordsplit           mu_wordsplit
+
+# define wordsplit_t         mu_wordsplit_t
+
+# define wordsplit_len               mu_wordsplit_len
+# define wordsplit_free              mu_wordsplit_free
+# define wordsplit_free_words        mu_wordsplit_free_words
+# define wordsplit_free_envbuf       mu_wordsplit_free_envbuf
+# define wordsplit_free_parambuf     mu_wordsplit_free_parambuf
+# define wordsplit_getwords          mu_wordsplit_getwords
+# define wordsplit_get_words         mu_wordsplit_get_words
+# define wordsplit_append            mu_wordsplit_append
+# define wordsplit_c_unquote_char    mu_wordsplit_c_unquote_char
+# define wordsplit_c_quote_char      mu_wordsplit_c_quote_char
+# define wordsplit_c_quoted_length   mu_wordsplit_c_quoted_length
+# define wordsplit_c_quote_copy      mu_wordsplit_c_quote_copy
+# define wordsplit_perror            mu_wordsplit_perror
+# define wordsplit_strerror          mu_wordsplit_strerror
+# define wordsplit_clearerr          mu_wordsplit_clearerr
+
+# include <mailutils/sys/wordsplit.h>
+
+# define MU_WORDSPLIT_ENV_INIT       WORDSPLIT_ENV_INIT
+# define MU_WRDSF_APPEND             WRDSF_APPEND
+# define MU_WRDSF_DOOFFS             WRDSF_DOOFFS
+# define MU_WRDSF_NOCMD              WRDSF_NOCMD
+# define MU_WRDSF_REUSE              WRDSF_REUSE
+# define MU_WRDSF_SHOWERR            WRDSF_SHOWERR
+# define MU_WRDSF_UNDEF              WRDSF_UNDEF
+# define MU_WRDSF_NOVAR              WRDSF_NOVAR
+# define MU_WRDSF_ENOMEMABRT         WRDSF_ENOMEMABRT
+# define MU_WRDSF_WS                 WRDSF_WS
+# define MU_WRDSF_SQUOTE             WRDSF_SQUOTE
+# define MU_WRDSF_DQUOTE             WRDSF_DQUOTE
+# define MU_WRDSF_QUOTE              WRDSF_QUOTE
+# define MU_WRDSF_SQUEEZE_DELIMS     WRDSF_SQUEEZE_DELIMS
+# define MU_WRDSF_RETURN_DELIMS      WRDSF_RETURN_DELIMS
+# define MU_WRDSF_SED_EXPR           WRDSF_SED_EXPR
+# define MU_WRDSF_DELIM              WRDSF_DELIM
+# define MU_WRDSF_COMMENT            WRDSF_COMMENT
+# define MU_WRDSF_ALLOC_DIE          WRDSF_ALLOC_DIE
+# define MU_WRDSF_ERROR              WRDSF_ERROR
+# define MU_WRDSF_DEBUG              WRDSF_DEBUG
+# define MU_WRDSF_ENV                WRDSF_ENV
+# define MU_WRDSF_GETVAR             WRDSF_GETVAR
+# define MU_WRDSF_SHOWDBG            WRDSF_SHOWDBG
+# define MU_WRDSF_NOSPLIT            WRDSF_NOSPLIT
+# define MU_WRDSF_KEEPUNDEF          WRDSF_KEEPUNDEF
+# define MU_WRDSF_WARNUNDEF          WRDSF_WARNUNDEF
+# define MU_WRDSF_CESCAPES           WRDSF_CESCAPES
+# define MU_WRDSF_CLOSURE            WRDSF_CLOSURE
+# define MU_WRDSF_ENV_KV             WRDSF_ENV_KV
+# define MU_WRDSF_ESCAPE             WRDSF_ESCAPE
+# define MU_WRDSF_INCREMENTAL        WRDSF_INCREMENTAL
+# define MU_WRDSF_PATHEXPAND         WRDSF_PATHEXPAND
+# define MU_WRDSF_OPTIONS            WRDSF_OPTIONS
+# define MU_WRDSF_DEFFLAGS           WRDSF_DEFFLAGS
+
+# define MU_WRDSO_NULLGLOB           WRDSO_NULLGLOB
+# define MU_WRDSO_FAILGLOB           WRDSO_FAILGLOB
+# define MU_WRDSO_DOTGLOB            WRDSO_DOTGLOB
+# define MU_WRDSO_GETVARPREF         WRDSO_GETVARPREF
+# define MU_WRDSO_BSKEEP_WORD        WRDSO_BSKEEP_WORD
+# define MU_WRDSO_OESC_WORD          WRDSO_OESC_WORD
+# define MU_WRDSO_XESC_WORD          WRDSO_XESC_WORD
+# define MU_WRDSO_MAXWORDS           WRDSO_MAXWORDS
+# define MU_WRDSO_BSKEEP_QUOTE       WRDSO_BSKEEP_QUOTE
+# define MU_WRDSO_OESC_QUOTE         WRDSO_OESC_QUOTE
+# define MU_WRDSO_XESC_QUOTE         WRDSO_XESC_QUOTE
+# define MU_WRDSO_NOVARSPLIT         WRDSO_NOVARSPLIT