[SCM] GNU Mailutils branch, master, updated. release-3.1-2-g723ade1

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=723ade1ac72fa2635d7aa04f6a118cefce44f15a

The branch, master has been updated
       via  723ade1ac72fa2635d7aa04f6a118cefce44f15a (commit)
      from  678d936783f591bcf7c3f8acafd0152a3c1b0b61 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 723ade1ac72fa2635d7aa04f6a118cefce44f15a
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Dec 14 11:25:52 2016 +0200

    Restore prematurely deleted header
    
    * include/mailutils/argcv.h: Restore
    * include/mailutils/Makefile.am: Add back argcv.h

-----------------------------------------------------------------------

Summary of changes:
 include/mailutils/Makefile.am          |    1 +
 include/mailutils/{error.h => argcv.h} |   32 ++++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)
 copy include/mailutils/{error.h => argcv.h} (57%)

diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index 642b98a..7b9425b 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -28,6 +28,7 @@ pkginclude_HEADERS = \
  acl.h\
  address.h\
  alloc.h\
+ argcv.h\
  assoc.h\
  attribute.h\
  auth.h\
diff --git a/include/mailutils/error.h b/include/mailutils/argcv.h
similarity index 57%
copy from include/mailutils/error.h
copy to include/mailutils/argcv.h
index ae26ed4..4744fb5 100644
--- a/include/mailutils/error.h
+++ b/include/mailutils/argcv.h
@@ -13,26 +13,42 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General
-   Public License along with this library.  If not, see
+   Public License along with this library.  If not, see 
    <http://www.gnu.org/licenses/>. */
 
-#ifndef _MAILUTILS_ERROR_H
-#define _MAILUTILS_ERROR_H
+#ifndef _ARGCV_H
+#define _ARGCV_H 1
 
-#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
 
 #include <mailutils/types.h>
-#include <mailutils/diag.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern int mu_verror (const char *fmt, va_list ap);
-extern int mu_error (const char *fmt, ...) MU_PRINTFLIKE(1,2);
+void mu_argcv_free (size_t argc, char **argv);
+void mu_argv_free (char **argv);
+
+enum mu_argcv_escape
+  {
+    mu_argcv_escape_no,
+    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);
+void mu_argcv_remove (int *pargc, char ***pargv,
+                     int (*sel) (const char *, void *), void *);
+int mu_argcv_string (int argc, char **argv, char **string);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _MAILUTILS_ERROR_H */
+#endif /* _ARGCV_H */


hooks/post-receive
-- 
GNU Mailutils