31 files changed, 512 insertions, 31 deletions

diff --git a/Makefile.am b/Makefile.am
index aed3f5ac4..d17f724e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,6 +94,7 @@ SUBDIRS = . \
  sql\
  libmu_auth\
  libproto\
+ libmu_compat\
  testsuite\
  lib\
  libmu_argp\
diff --git a/configure.ac b/configure.ac
index abcf5c9fb..aafad7f31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1205,6 +1205,7 @@ AC_ARG_WITH([mh-bindir],
 # Initialize the (autotest) test suite.
 AC_CONFIG_TESTDIR(libmailutils/tests)
 AC_CONFIG_TESTDIR(testsuite)
+AC_CONFIG_TESTDIR(libmu_compat/tests)
 AC_CONFIG_TESTDIR(frm/tests)
 AC_CONFIG_TESTDIR(maidag/tests)
 AC_CONFIG_TESTDIR(messages/tests)
@@ -1214,6 +1215,8 @@ AC_CONFIG_TESTDIR(mh/tests)
 
 AC_CONFIG_FILES([libmailutils/tests/Makefile
                  libmailutils/tests/atlocal
+                 libmu_compat/tests/Makefile
+                 libmu_compat/tests/atlocal
                  testsuite/Makefile
                  testsuite/atlocal
                  frm/tests/Makefile
@@ -1368,6 +1371,7 @@ AC_CONFIG_FILES([
  libproto/pop/Makefile
  libproto/nntp/Makefile
  libproto/imap/Makefile
+ libmu_compat/Makefile
  maidag/Makefile
  mail/Makefile
  mail/testsuite/Makefile
@@ -1384,6 +1388,7 @@ AC_CONFIG_FILES([
  libmailutils/server/Makefile
  libmailutils/string/Makefile
  libmailutils/stream/Makefile
+ libmailutils/stdstream/Makefile
  libmailutils/url/Makefile
  libmailutils/Makefile
  messages/Makefile
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index b52db2c78..b31515819 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -61,6 +61,7 @@ pkginclude_HEADERS = \
  libcfg.h\
  list.h\
  locker.h\
+ log.h\
  mailbox.h\
  mailcap.h\
  mailer.h\
@@ -90,6 +91,7 @@ pkginclude_HEADERS = \
  server.h\
  sieve.h\
  smtp.h\
+ stdstream.h\
  stream.h\
  syslog.h\
  sql.h\
diff --git a/include/mailutils/argcv.h b/include/mailutils/argcv.h
index 49d3bfa2d..4a8f29399 100644
--- a/include/mailutils/argcv.h
+++ b/include/mailutils/argcv.h
@@ -24,6 +24,8 @@
 #include <unistd.h>
 #include <string.h>
 
+#include <mailutils/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,20 +39,22 @@ enum mu_argcv_escape
     mu_argcv_escape_c
     /*    mu_argcv_escape_sh */
   };
+
 int mu_argcv_join (int argc, char **argv, char *delim,
                    enum mu_argcv_escape esc,
                    char **pstring);
-int mu_argcv_string (int argc, char **argv, char **string);
-
 void mu_argcv_remove (int *pargc, char ***pargv,
                       int (*sel) (const char *, void *), void *);
-  
+int mu_argcv_string (int argc, char **argv, char **string);
+
+  
 /* Deprecated interfaces */  
+
 #define MU_ARGCV_RETURN_DELIMS 0x01
 
 #ifndef MU_ARCGV_DEPRECATED
-# define MU_ARCGV_DEPRECATED __attribute__((deprecated))
-#endif  
+# define MU_ARCGV_DEPRECATED MU_DEPRECATED
+#endif
   
 int mu_argcv_get    (const char *command, const char *delim,
                      const char *cmnt,
diff --git a/include/mailutils/log.h b/include/mailutils/log.h
new file mode 100644
index 000000000..a36b85ab5
--- /dev/null
+++ b/include/mailutils/log.h
@@ -0,0 +1,49 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   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.
+
+   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 GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef _MAILUTILS_LOG_H
+#define _MAILUTILS_LOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <mailutils/types.h>
+
+#define MU_LOG_DEBUG   0
+#define MU_LOG_INFO    1
+#define MU_LOG_NOTICE  2
+#define MU_LOG_WARNING 3
+#define MU_LOG_ERROR   4
+#define MU_LOG_CRIT    5
+#define MU_LOG_ALERT   6
+#define MU_LOG_EMERG   7
+
+#define MU_LOGMODE_SEVERITY 0x0001
+#define MU_LOGMODE_LOCUS    0x0002
+
+int mu_log_stream_create (mu_stream_t *, mu_stream_t); 
+int mu_syslog_stream_create (mu_stream_t *, int);
+
+extern char *_mu_severity_str[];
+extern int _mu_severity_num;
+  
+#ifdef __cplusplus
+}
+#endif
+  
+#endif
+  
diff --git a/include/mailutils/mailutils.h b/include/mailutils/mailutils.h
index ccaa3d5e6..19b8e773f 100644
--- a/include/mailutils/mailutils.h
+++ b/include/mailutils/mailutils.h
@@ -59,12 +59,12 @@
 #include <mailutils/url.h>
 #include <mailutils/gocs.h>
 #include <mailutils/version.h>
-#include <mailutils/vartab.h>
 #include <mailutils/io.h>
 #include <mailutils/secret.h>