143 files changed, 9 insertions, 9 deletions

diff --git a/Makefile.am b/Makefile.am
index 81aefd286..86c26cd08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,7 +94,7 @@ SUBDIRS = . \
  include\
  po\
  testsuite\
- mailbox\
+ libmailutils\
  sql\
  libmu_auth\
  libproto\
diff --git a/configure.ac b/configure.ac
index c7babe753..2b097f7d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 AC_PREREQ(2.63)
 AC_INIT([GNU Mailutils], [2.2.90], [bug-mailutils@gnu.org], [mailutils])
-AC_CONFIG_SRCDIR([mailbox/mailbox.c])
+AC_CONFIG_SRCDIR([libmailutils/mailbox.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([gnits 1.11 dist-bzip2 dist-lzma dist-xz std-options silent-rules])
 AC_CONFIG_HEADERS([config.h])
@@ -38,7 +38,7 @@ AC_SUBST(VI_AGE,      1)
 
 dnl Library paths
 AC_SUBST(MU_LIB_AUTH,'${top_builddir}/libmu_auth/libmu_auth.la')
-AC_SUBST(MU_LIB_MAILUTILS,'${top_builddir}/mailbox/libmailutils.la')
+AC_SUBST(MU_LIB_MAILUTILS,'${top_builddir}/libmailutils/libmailutils.la')
 AC_SUBST(MU_LIB_SQL,'${top_builddir}/sql/libsql.la')
 AC_SUBST(MU_LIB_IMAP)
 AC_SUBST(MU_LIB_MAILDIR)
@@ -69,9 +69,9 @@ AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la
 # header files. There are two exceptions, though. See NOTE before the
 # AC_CONFIG_LINKS statements, below.
 
-AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include  -I${top_builddir}/include -I${top_srcdir}/mailbox')
+AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include  -I${top_builddir}/include')
 
-AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
+AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
 
 dnl Check for programs
 AC_PROG_CC
@@ -112,7 +112,7 @@ AC_CHECK_TYPE(iconv_t,:,
 
 # NOTE: Generally speaking, Mailutils libraries are not allowed to include
 # gnulib headers.  The only exceptions are: gettext.h, which is needed for
-# proper i18n, and intprops.h, which is used in mailbox/cfg_parser.y.
+# proper i18n, and intprops.h, which is used in libmailutils/cfg_parser.y.
 # This latter will probably be rewritten to remove the need for intprops.h.
 #
 # To make these two headers accessible for the libraries, they are linked
@@ -1361,8 +1361,8 @@ AC_CONFIG_FILES([
  maidag/Makefile
  mail/Makefile
  mail/testsuite/Makefile
- mailbox/Makefile
- mailbox/testsuite/Makefile
+ libmailutils/Makefile
+ libmailutils/testsuite/Makefile
  messages/Makefile
  messages/testsuite/Makefile
  mh/Makefile
diff --git a/mailbox/.gitignore b/libmailutils/.gitignore
index 8ce64ea2d..8ce64ea2d 100644
--- a/mailbox/.gitignore
+++ b/libmailutils/.gitignore
diff --git a/mailbox/Makefile.am b/libmailutils/Makefile.am
index a4cbc4926..f28b1bdbc 100644
--- a/mailbox/Makefile.am
+++ b/libmailutils/Makefile.am
@@ -18,7 +18,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
 
 YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
 AM_YFLAGS=-vt
diff --git a/mailbox/acl.c b/libmailutils/acl.c
index a3e3764f2..a3e3764f2 100644
--- a/mailbox/acl.c
+++ b/libmailutils/acl.c
diff --git a/mailbox/address.c b/libmailutils/address.c
index cd151c141..cd151c141 100644
--- a/mailbox/address.c
+++ b/libmailutils/address.c
diff --git a/mailbox/alloc.c b/libmailutils/alloc.c
index 05801bb1a..05801bb1a 100644
--- a/mailbox/alloc.c
+++ b/libmailutils/alloc.c
diff --git a/mailbox/amd.c b/libmailutils/amd.c
index 3cf3dde6c..3cf3dde6c 100644
--- a/mailbox/amd.c
+++ b/libmailutils/amd.c
diff --git a/mailbox/argcv.c b/libmailutils/argcv.c
index 636b9af96..636b9af96 100644
--- a/mailbox/argcv.c
+++ b/libmailutils/argcv.c
diff --git a/mailbox/asnprintf.c b/libmailutils/asnprintf.c
index f8ef54334..f8ef54334 100644
--- a/mailbox/asnprintf.c
+++ b/libmailutils/asnprintf.c
diff --git a/mailbox/asprintf.c b/libmailutils/asprintf.c
index c563bcb84..c563bcb84 100644
--- a/mailbox/asprintf.c
+++ b/libmailutils/asprintf.c
diff --git a/mailbox/assoc.c b/libmailutils/assoc.c
index a0c13a0ed..a0c13a0ed 100644
--- a/mailbox/assoc.c
+++ b/libmailutils/assoc.c
diff --git a/mailbox/attachment.c b/libmailutils/attachment.c
index 6bed79fff..6bed79fff 100644
--- a/mailbox/attachment.c
+++ b/libmailutils/attachment.c
diff --git a/mailbox/attribute.c b/libmailutils/attribute.c
index 3e76855fd..3e76855fd 100644
--- a/mailbox/attribute.c
+++ b/libmailutils/attribute.c
diff --git a/mailbox/auth.c b/libmailutils/auth.c
index 2d3e9749e..2d3e9749e 100644
--- a/mailbox/auth.c
+++ b/libmailutils/auth.c
diff --git a/mailbox/base64.c b/libmailutils/base64.c
index 7a8c62282..7a8c62282 100644
--- a/mailbox/base64.c
+++ b/libmailutils/base64.c
diff --git a/mailbox/binflt.c b/libmailutils/binflt.c
index d3de5185c..d3de5185c 100644
--- a/mailbox/binflt.c
+++ b/libmailutils/binflt.c
diff --git a/mailbox/body.c b/libmailutils/body.c
index 513ad01ac..513ad01ac 100644
--- a/mailbox/body.c
+++ b/libmailutils/body.c
diff --git a/mailbox/cfg_driver.c b/libmailutils/cfg_driver.c
index f4d56f710..f4d56f710 100644
--- a/mailbox/cfg_driver.c
+++ b/libmailutils/cfg_driver.c
diff --git a/mailbox/cfg_format.c b/libmailutils/cfg_format.c
index be37bae3c..be37bae3c 100644
--- a/mailbox/cfg_format.c
+++ b/libmailutils/cfg_format.c
diff --git a/mailbox/cfg_lexer.l b/libmailutils/cfg_lexer.l
index 998d84d9b..998d84d9b 100644
--- a/mailbox/cfg_lexer.l
+++ b/libmailutils/cfg_lexer.l
diff --git a/mailbox/cfg_parser.y b/libmailutils/cfg_parser.y
index 8b13ae10d..8b13ae10d 100644
--- a/mailbox/cfg_parser.y
+++ b/libmailutils/cfg_parser.y
diff --git a/mailbox/crlfdot.c b/libmailutils/crlfdot.c
index eed4519ac..eed4519ac 100644
--- a/mailbox/crlfdot.c
+++ b/libmailutils/crlfdot.c
diff --git a/mailbox/crlfflt.c b/libmailutils/crlfflt.c
index 9dc147c9e..9dc147c9e 100644
--- a/mailbox/crlfflt.c
+++ b/libmailutils/crlfflt.c
diff --git a/mailbox/cstrcasecmp.c b/libmailutils/cstrcasecmp.c
index 4baeae220..4baeae220 100644
--- a/mailbox/cstrcasecmp.c
+++ b/libmailutils/cstrcasecmp.c
diff --git a/mailbox/cstrlower.c b/libmailutils/cstrlower.c
index 98afb5f35..98afb5f35 100644
--- a/mailbox/cstrlower.c
+++ b/libmailutils/cstrlower.c
diff --git a/mailbox/cstrupper.c b/libmailutils/cstrupper.c
index 965977d44..965977d44 100644
--- a/mailbox/cstrupper.c
+++ b/libmailutils/cstrupper.c
diff --git a/mailbox/daemon.c b/libmailutils/daemon.c
index b7fca61a5..b7fca61a5 100644
--- a/mailbox/daemon.c
+++ b/libmailutils/daemon.c
diff --git a/mailbox/date.c b/libmailutils/date.c
index d667e345b..d667e345b 100644
--- a/mailbox/date.c
+++ b/libmailutils/date.c
diff --git a/mailbox/dbgstderr.c b/libmailutils/dbgstderr.c
index 9a2e16441..9a2e16441 100644
--- a/mailbox/dbgstderr.c
+++ b/libmailutils/dbgstderr.c
diff --git a/mailbox/dbgstream.c b/libmailutils/dbgstream.c
index b03f29915..b03f29915 100644
--- a/mailbox/dbgstream.c
+++ b/libmailutils/dbgstream.c
diff --git a/mailbox/dbgsyslog.c b/libmailutils/dbgsyslog.c
index f906cd3a5..f906cd3a5 100644
--- a/mailbox/dbgsyslog.c
+++ b/libmailutils/dbgsyslog.c
diff --git a/mailbox/debug.c b/libmailutils/debug.c
index 7570f2387..7570f2387 100644
--- a/mailbox/debug.c
+++ b/libmailutils/debug.c
diff --git a/mailbox/diag.c b/libmailutils/diag.c
index 7497c82c0..7497c82c0 100644
--- a/mailbox/diag.c
+++ b/libmailutils/diag.c
diff --git a/mailbox/dot.c b/libmailutils/dot.c
index a0d43fad7..a0d43fad7 100644
--- a/mailbox/dot.c
+++ b/libmailutils/dot.c
diff --git a/mailbox/envelope.c b/libmailutils/envelope.c
index 1e5aa4aee..1e5aa4aee 100644
--- a/mailbox/envelope.c
+++ b/libmailutils/envelope.c
diff --git a/mailbox/errors b/libmailutils/errors
index 06eb98b48..06eb98b48 100644
--- a/mailbox/errors
+++ b/libmailutils/errors
diff --git a/mailbox/fgetpwent.c b/libmailutils/fgetpwent.c
index 99ec9dae9..99ec9dae9 100644
--- a/mailbox/fgetpwent.c
+++ b/libmailutils/fgetpwent.c
diff --git a/mailbox/file_stream.c b/libmailutils/file_stream.c
index 0df1254e1..0df1254e1 100644
--- a/mailbox/file_stream.c
+++ b/libmailutils/file_stream.c
diff --git a/mailbox/filter.c b/libmailutils/filter.c
index 8fdc25f90..8fdc25f90 100644
--- a/mailbox/filter.c
+++ b/libmailutils/filter.c
diff --git a/mailbox/filter_iconv.c b/libmailutils/filter_iconv.c
index 88c397dbd..88c397dbd 100644
--- a/mailbox/filter_iconv.c
+++ b/libmailutils/filter_iconv.c
diff --git a/mailbox/fltstream.c b/libmailutils/fltstream.c
index 4359e03ea..4359e03ea 100644
--- a/mailbox/fltstream.c
+++ b/libmailutils/fltstream.c
diff --git a/mailbox/folder.c b/libmailutils/folder.c
index 3ce430a15..3ce430a15 100644
--- a/mailbox/folder.c
+++ b/libmailutils/folder.c
diff --git a/mailbox/freeitem.c b/libmailutils/freeitem.c
index c268ea455..c268ea455 100644
--- a/mailbox/freeitem.c
+++ b/libmailutils/freeitem.c
diff --git a/mailbox/gdebug.c b/libmailutils/gdebug.c
index 3d1a54c38..3d1a54c38 100644
--- a/mailbox/gdebug.c
+++ b/libmailutils/gdebug.c
diff --git a/mailbox/gocs.c b/libmailutils/gocs.c
index 40bde9d0d..40bde9d0d 100644
--- a/mailbox/gocs.c
+++ b/libmailutils/gocs.c
diff --git a/mailbox/hdritr.c b/libmailutils/hdritr.c
index 595735ffa..595735ffa 100644
--- a/mailbox/hdritr.c
+++ b/libmailutils/hdritr.c
diff --git a/mailbox/header.c b/libmailutils/header.c
index 2861c676b..2861c676b 100644
--- a/mailbox/header.c
+++ b/libmailutils/header.c
diff --git a/mailbox/iostream.c b/libmailutils/iostream.c
index 1a7da7e7b..1a7da7e7b 100644
--- a/mailbox/iostream.c
+++ b/libmailutils/iostream.c
diff --git a/mailbox/ipsrv.c b/libmailutils/ipsrv.c
index e3efc62d1..e3efc62d1 100644
--- a/mailbox/ipsrv.c
+++ b/libmailutils/ipsrv.c
diff --git a/mailbox/iterator.c b/libmailutils/iterator.c
index 38979255a..38979255a 100644
--- a/mailbox/iterator.c
+++ b/libmailutils/iterator.c
diff --git a/mailbox/kwd.c b/libmailutils/kwd.c
index 9135f9f96..9135f9f96 100644
--- a/mailbox/kwd.c
+++ b/libmailutils/kwd.c
diff --git a/mailbox/linelenflt.c b/libmailutils/linelenflt.c
index e3817de9f..e3817de9f 100644
--- a/mailbox/linelenflt.c
+++ b/libmailutils/linelenflt.c
diff --git a/mailbox/list.c b/libmailutils/list.c
index 91f6a6ead..91f6a6ead 100644
--- a/mailbox/list.c
+++ b/libmailutils/list.c
diff --git a/mailbox/listlist.c b/libmailutils/listlist.c
index 94172ac8f..94172ac8f 100644
--- a/mailbox/listlist.c
+++ b/libmailutils/listlist.c
diff --git a/mailbox/locale.c b/libmailutils/locale.c
index b6bdc086a..b6bdc086a 100644
--- a/mailbox/locale.c
+++ b/libmailutils/locale.c
diff --git a/mailbox/locker.c b/libmailutils/locker.c
index f752c1661..f752c1661 100644
--- a/mailbox/locker.c
+++ b/libmailutils/locker.c
diff --git a/mailbox/mailbox.c b/libmailutils/mailbox.c
index e1c7b59f1..e1c7b59f1 100644
--- a/mailbox/mailbox.c
+++ b/libmailutils/mailbox.c
diff --git a/mailbox/mailcap.c b/libmailutils/mailcap.c
index d9e96f2a9..d9e96f2a9 100644
--- a/mailbox/mailcap.c
+++ b/libmailutils/mailcap.c
diff --git a/mailbox/mailer.c b/libmailutils/mailer.c
index 2240b657e..2240b657e 100644
--- a/mailbox/mailer.c
+++ b/libmailutils/mailer.c
diff --git a/mailbox/mapfile_stream.c b/libmailutils/mapfile_stream.c
index 8733622a7..8733622a7 100644
--- a/mailbox/mapfile_stream.c
+++ b/libmailutils/mapfile_stream.c
diff --git a/mailbox/mbx_default.c b/libmailutils/mbx_default.c
index 348e7f7d9..348e7f7d9 100644
--- a/mailbox/mbx_default.c
+++ b/libmailutils/mbx_default.c
diff --git a/mailbox/mbxitr.c b/libmailutils/mbxitr.c
index 8463201e5..8463201e5 100644
--- a/mailbox/mbxitr.c
+++ b/libmailutils/mbxitr.c
diff --git a/mailbox/md5.c b/libmailutils/md5.c
index a6d3247e3..a6d3247e3 100644
--- a/mailbox/md5.c
+++ b/libmailutils/md5.c
diff --git a/mailbox/memory_stream.c b/libmailutils/memory_stream.c
index 98db75385..98db75385 100644
--- a/mailbox/memory_stream.c
+++ b/libmailutils/memory_stream.c
diff --git a/mailbox/message.c b/libmailutils/message.c
index f276d0a4a..f276d0a4a 100644
--- a/mailbox/message.c
+++ b/libmailutils/message.c
diff --git a/mailbox/message_stream.c b/libmailutils/message_stream.c
index cfcd2ddbe..cfcd2ddbe 100644
--- a/mailbox/message_stream.c
+++ b/libmailutils/message_stream.c
diff --git a/mailbox/mime.c b/libmailutils/mime.c
index 2c923cc74..2c923cc74 100644
--- a/mailbox/mime.c
+++ b/libmailutils/mime.c
diff --git a/mailbox/mimehdr.c b/libmailutils/mimehdr.c
index 0314734fc..0314734fc 100644
--- a/mailbox/mimehdr.c
+++ b/libmailutils/mimehdr.c
diff --git a/mailbox/mkfilename.c b/libmailutils/mkfilename.c
index ecd6dee78..ecd6dee78 100644
--- a/mailbox/mkfilename.c
+++ b/libmailutils/mkfilename.c
diff --git a/mailbox/monitor.c b/libmailutils/monitor.c
index 45e7dc9c3..45e7dc9c3 100644
--- a/mailbox/monitor.c
+++ b/libmailutils/monitor.c
diff --git a/mailbox/msgscan.c b/libmailutils/msgscan.c
index dbbafedf0..dbbafedf0 100644
--- a/mailbox/msgscan.c
+++ b/libmailutils/msgscan.c
diff --git a/mailbox/msrv.c b/libmailutils/msrv.c
index 209da4498..209da4498 100644
--- a/mailbox/msrv.c
+++ b/libmailutils/msrv.c
diff --git a/mailbox/mu_auth.c b/libmailutils/mu_auth.c
index bba6b45d4..bba6b45d4 100644
--- a/mailbox/mu_auth.c
+++ b/libmailutils/mu_auth.c
diff --git a/mailbox/muctype.c b/libmailutils/muctype.c
index e425ffb30..e425ffb30 100644
--- a/mailbox/muctype.c
+++ b/libmailutils/muctype.c
diff --git a/mailbox/muerrno.cin b/libmailutils/muerrno.cin
index f00fb9413..f00fb9413 100644
--- a/mailbox/muerrno.cin
+++ b/libmailutils/muerrno.cin
diff --git a/mailbox/muerror.c b/libmailutils/muerror.c
index e18f0feca..e18f0feca 100644
--- a/mailbox/muerror.c
+++ b/libmailutils/muerror.c
diff --git a/mailbox/munre.c b/libmailutils/munre.c
index ca66cadb5..ca66cadb5 100644
--- a/mailbox/munre.c
+++ b/libmailutils/munre.c
diff --git a/mailbox/mutil.c b/libmailutils/mutil.c
index aa11d56cb..aa11d56cb 100644
--- a/mailbox/mutil.c
+++ b/libmailutils/mutil.c
diff --git a/mailbox/nls.c b/libmailutils/nls.c
index 4b9a8fe05..4b9a8fe05 100644
--- a/mailbox/nls.c
+++ b/libmailutils/nls.c
diff --git a/mailbox/nullrec.c b/libmailutils/nullrec.c
index 9d080cd86..9d080cd86 100644
--- a/mailbox/nullrec.c
+++ b/libmailutils/nullrec.c
diff --git a/mailbox/observer.c b/libmailutils/observer.c
index 51b02602f..51b02602f 100644
--- a/mailbox/observer.c
+++ b/libmailutils/observer.c
diff --git a/mailbox/opool.c b/libmailutils/opool.c
index 991b5276b..991b5276b 100644
--- a/mailbox/opool.c
+++ b/libmailutils/opool.c
diff --git a/mailbox/parse822.c b/libmailutils/parse822.c
index b4d66bc9b..b4d66bc9b 100644
--- a/mailbox/parse822.c
+++ b/libmailutils/parse822.c
diff --git a/mailbox/parsedate.y b/libmailutils/parsedate.y
index 79eda8b8d..79eda8b8d 100644
--- a/mailbox/parsedate.y
+++ b/libmailutils/parsedate.y
diff --git a/mailbox/permstr.c b/libmailutils/permstr.c
index d3d184a70..d3d184a70 100644
--- a/mailbox/permstr.c
+++ b/libmailutils/permstr.c
diff --git a/mailbox/prog_stream.c b/libmailutils/prog_stream.c
index ef353612c..ef353612c 100644
--- a/mailbox/prog_stream.c
+++ b/libmailutils/prog_stream.c
diff --git a/mailbox/progmailer.c b/libmailutils/progmailer.c
index f39440fcd..f39440fcd 100644
--- a/mailbox/progmailer.c
+++ b/libmailutils/progmailer.c
diff --git a/mailbox/property.c b/libmailutils/property.c
index 435d8e20c..435d8e20c 100644
--- a/mailbox/property.c
+++ b/libmailutils/property.c
diff --git a/mailbox/qpflt.c b/libmailutils/qpflt.c
index aaada1e5f..aaada1e5f 100644
--- a/mailbox/qpflt.c
+++ b/libmailutils/qpflt.c
diff --git a/mailbox/rdcache_stream.c b/libmailutils/rdcache_stream.c
index 4789811fe..4789811fe 100644
--- a/mailbox/rdcache_stream.c
+++ b/libmailutils/rdcache_stream.c
diff --git a/mailbox/refcount.c b/libmailutils/refcount.c
index 1be1fc6ab..1be1fc6ab 100644
--- a/mailbox/refcount.c
+++ b/libmailutils/refcount.c
diff --git a/mailbox/registrar.c b/libmailutils/registrar.c
index a1a2b4f1a..a1a2b4f1a 100644
--- a/mailbox/registrar.c
+++ b/libmailutils/registrar.c
diff --git a/mailbox/rfc2047.c b/libmailutils/rfc2047.c
index c30ba2fe0..c30ba2fe0 100644
--- a/mailbox/rfc2047.c
+++ b/libmailutils/rfc2047.c
diff --git a/mailbox/secret.c b/libmailutils/secret.c
index e472839cd..e472839cd 100644
--- a/mailbox/secret.c
+++ b/libmailutils/secret.c
diff --git a/mailbox/server.c b/libmailutils/server.c
index 3214fb0c0..3214fb0c0 100644
--- a/mailbox/server.c
+++ b/libmailutils/server.c
diff --git a/mailbox/sha1.c b/libmailutils/sha1.c
index 57d6377e2..57d6377e2 100644
--- a/mailbox/sha1.c
+++ b/libmailutils/sha1.c
diff --git a/mailbox/size_max.h b/libmailutils/size_max.h
index ee3fc251c..ee3fc251c 100644
--- a/mailbox/size_max.h
+++ b/libmailutils/size_max.h
diff --git a/mailbox/socket_stream.c b/libmailutils/socket_stream.c
index 2764b2b25..2764b2b25 100644
--- a/mailbox/socket_stream.c
+++ b/libmailutils/socket_stream.c
diff --git a/mailbox/stdio_stream.c b/libmailutils/stdio_stream.c
index 93ff011d6..93ff011d6 100644
--- a/mailbox/stdio_stream.c
+++ b/libmailutils/stdio_stream.c
diff --git a/mailbox/stream.c b/libmailutils/stream.c
index 978f12a7b..978f12a7b 100644
--- a/mailbox/stream.c
+++ b/libmailutils/stream.c
diff --git a/mailbox/stream_printf.c b/libmailutils/stream_printf.c
index 947fd3b63..947fd3b63 100644
--- a/mailbox/stream_printf.c
+++ b/libmailutils/stream_printf.c
diff --git a/mailbox/stream_vprintf.c b/libmailutils/stream_vprintf.c
index 5bd9c09e0..5bd9c09e0 100644
--- a/mailbox/stream_vprintf.c
+++ b/libmailutils/stream_vprintf.c
diff --git a/mailbox/streamcpy.c b/libmailutils/streamcpy.c
index 48126677f..48126677f 100644
--- a/mailbox/streamcpy.c
+++ b/libmailutils/streamcpy.c
diff --git a/mailbox/streamref.c b/libmailutils/streamref.c
index 83f401ebb..83f401ebb 100644
--- a/mailbox/streamref.c
+++ b/libmailutils/streamref.c
diff --git a/mailbox/stripws.c b/libmailutils/stripws.c
index 688c8c720..688c8c720 100644
--- a/mailbox/stripws.c
+++ b/libmailutils/stripws.c
diff --git a/mailbox/strltrim.c b/libmailutils/strltrim.c
index e86980723..e86980723 100644
--- a/mailbox/strltrim.c
+++ b/libmailutils/strltrim.c
diff --git a/mailbox/strrtrim.c b/libmailutils/strrtrim.c
index 95e7babf2..95e7babf2 100644
--- a/mailbox/strrtrim.c
+++ b/libmailutils/strrtrim.c
diff --git a/mailbox/strskip.c b/libmailutils/strskip.c
index f24d1193c..f24d1193c 100644
--- a/mailbox/strskip.c
+++ b/libmailutils/strskip.c
diff --git a/mailbox/syslog.c b/libmailutils/syslog.c
index c97da9be9..c97da9be9 100644
--- a/mailbox/syslog.c
+++ b/libmailutils/syslog.c
diff --git a/mailbox/system.c b/libmailutils/system.c
index 8e28caa79..8e28caa79 100644
--- a/mailbox/system.c
+++ b/libmailutils/system.c
diff --git a/mailbox/tcp.c b/libmailutils/tcp.c
index ba15ae852..ba15ae852 100644
--- a/mailbox/tcp.c
+++ b/libmailutils/tcp.c
diff --git a/mailbox/temp_file_stream.c b/libmailutils/temp_file_stream.c
index c5346b2b6..c5346b2b6 100644
--- a/mailbox/temp_file_stream.c
+++ b/libmailutils/temp_file_stream.c
diff --git a/mailbox/testsuite/.gitignore b/libmailutils/testsuite/.gitignore
index 989f5903e..989f5903e 100644
--- a/mailbox/testsuite/.gitignore
+++ b/libmailutils/testsuite/.gitignore
diff --git a/mailbox/testsuite/Addrs b/libmailutils/testsuite/Addrs
index f301e6545..f301e6545 100644
--- a/mailbox/testsuite/Addrs
+++ b/libmailutils/testsuite/Addrs
diff --git a/mailbox/testsuite/Argcv b/libmailutils/testsuite/Argcv
index 076edc920..076edc920 100644
--- a/mailbox/testsuite/Argcv
+++ b/libmailutils/testsuite/Argcv
diff --git a/mailbox/testsuite/Decode b/libmailutils/testsuite/Decode
index da6724734..da6724734 100644
--- a/mailbox/testsuite/Decode
+++ b/libmailutils/testsuite/Decode
diff --git a/mailbox/testsuite/Decode2047 b/libmailutils/testsuite/Decode2047
index 96bd334d4..96bd334d4 100644
--- a/mailbox/testsuite/Decode2047
+++ b/libmailutils/testsuite/Decode2047
diff --git a/mailbox/testsuite/Encode b/libmailutils/testsuite/Encode
index c86626638..c86626638 100644
--- a/mailbox/testsuite/Encode
+++ b/libmailutils/testsuite/Encode
diff --git a/mailbox/testsuite/Encode2047 b/libmailutils/testsuite/Encode2047
index de098eca0..de098eca0 100644
--- a/mailbox/testsuite/Encode2047
+++ b/libmailutils/testsuite/Encode2047
diff --git a/mailbox/testsuite/Mailcap b/libmailutils/testsuite/Mailcap
index a8dcb4e62..a8dcb4e62 100644
--- a/mailbox/testsuite/Mailcap
+++ b/libmailutils/testsuite/Mailcap
diff --git a/mailbox/testsuite/Makefile.am b/libmailutils/testsuite/Makefile.am
index fb30e88a5..fb30e88a5 100644
--- a/mailbox/testsuite/Makefile.am
+++ b/libmailutils/testsuite/Makefile.am
diff --git a/mailbox/testsuite/Mime b/libmailutils/testsuite/Mime
index 147c16ea4..147c16ea4 100644
--- a/mailbox/testsuite/Mime
+++ b/libmailutils/testsuite/Mime
diff --git a/mailbox/testsuite/Urls b/libmailutils/testsuite/Urls
index a6e565eac..a6e565eac 100644
--- a/mailbox/testsuite/Urls
+++ b/libmailutils/testsuite/Urls
diff --git a/mailbox/testsuite/lib/DISTFILES b/libmailutils/testsuite/lib/DISTFILES
index b42768e44..b42768e44 100644
--- a/mailbox/testsuite/lib/DISTFILES
+++ b/libmailutils/testsuite/lib/DISTFILES
diff --git a/mailbox/testsuite/lib/mailbox.exp b/libmailutils/testsuite/lib/mailbox.exp
index abc273ea6..abc273ea6 100644
--- a/mailbox/testsuite/lib/mailbox.exp
+++ b/libmailutils/testsuite/lib/mailbox.exp
diff --git a/mailbox/testsuite/mailbox/DISTFILES b/libmailutils/testsuite/mailbox/DISTFILES
index 55cc9e12c..55cc9e12c 100644
--- a/mailbox/testsuite/mailbox/DISTFILES
+++ b/libmailutils/testsuite/mailbox/DISTFILES
diff --git a/mailbox/testsuite/mailbox/address.exp b/libmailutils/testsuite/mailbox/address.exp
index 2809580e9..2809580e9 100644
--- a/mailbox/testsuite/mailbox/address.exp
+++ b/libmailutils/testsuite/mailbox/address.exp
diff --git a/mailbox/testsuite/mailbox/argcv.exp b/libmailutils/testsuite/mailbox/argcv.exp
index 88db5e194..88db5e194 100644
--- a/mailbox/testsuite/mailbox/argcv.exp
+++ b/libmailutils/testsuite/mailbox/argcv.exp
diff --git a/mailbox/testsuite/mailbox/base64.exp b/libmailutils/testsuite/mailbox/base64.exp
index b86ca6f01..b86ca6f01 100644
--- a/mailbox/testsuite/mailbox/base64.exp
+++ b/libmailutils/testsuite/mailbox/base64.exp
diff --git a/mailbox/testsuite/mailbox/decode2047.exp b/libmailutils/testsuite/mailbox/decode2047.exp
index b91fa65fa..b91fa65fa 100644
--- a/mailbox/testsuite/mailbox/decode2047.exp
+++ b/libmailutils/testsuite/mailbox/decode2047.exp
diff --git a/mailbox/testsuite/mailbox/encode2047.exp b/libmailutils/testsuite/mailbox/encode2047.exp
index d696130ff..d696130ff 100644
--- a/mailbox/testsuite/mailbox/encode2047.exp
+++ b/libmailutils/testsuite/mailbox/encode2047.exp
diff --git a/mailbox/testsuite/mailbox/list.exp b/libmailutils/testsuite/mailbox/list.exp
index acb7bb220..acb7bb220 100644
--- a/mailbox/testsuite/mailbox/list.exp
+++ b/libmailutils/testsuite/mailbox/list.exp
diff --git a/mailbox/testsuite/mailbox/mailcap.exp b/libmailutils/testsuite/mailbox/mailcap.exp
index eaed86782..eaed86782 100644
--- a/mailbox/testsuite/mailbox/mailcap.exp
+++ b/libmailutils/testsuite/mailbox/mailcap.exp
diff --git a/mailbox/testsuite/mailbox/mime.exp b/libmailutils/testsuite/mailbox/mime.exp
index aabecfe9e..aabecfe9e 100644
--- a/mailbox/testsuite/mailbox/mime.exp
+++ b/libmailutils/testsuite/mailbox/mime.exp
diff --git a/mailbox/testsuite/mailbox/url.exp b/libmailutils/testsuite/mailbox/url.exp
index f39030662..f39030662 100644
--- a/mailbox/testsuite/mailbox/url.exp
+++ b/libmailutils/testsuite/mailbox/url.exp
diff --git a/mailbox/ticket.c b/libmailutils/ticket.c
index ae4952023..ae4952023 100644
--- a/mailbox/ticket.c
+++ b/libmailutils/ticket.c
diff --git a/mailbox/url.c b/libmailutils/url.c
index 5f7379df4..5f7379df4 100644
--- a/mailbox/url.c
+++ b/libmailutils/url.c
diff --git a/mailbox/vartab.c b/libmailutils/vartab.c
index 7364ba81c..7364ba81c 100644
--- a/mailbox/vartab.c
+++ b/libmailutils/vartab.c
diff --git a/mailbox/vasnprintf.c b/libmailutils/vasnprintf.c
index 0f4350edb..0f4350edb 100644
--- a/mailbox/vasnprintf.c
+++ b/libmailutils/vasnprintf.c
diff --git a/mailbox/version.c b/libmailutils/version.c
index 1967daba6..1967daba6 100644
--- a/mailbox/version.c
+++ b/libmailutils/version.c
diff --git a/mailbox/wicket.c b/libmailutils/wicket.c
index 82b179b01..82b179b01 100644
--- a/mailbox/wicket.c
+++ b/libmailutils/wicket.c
diff --git a/mailbox/xscript-stream.c b/libmailutils/xscript-stream.c
index 02fafa19e..02fafa19e 100644
--- a/mailbox/xscript-stream.c
+++ b/libmailutils/xscript-stream.c