2 files changed, 86 insertions, 0 deletions
diff --git a/gnulib b/gnulib
deleted file mode 160000
-Subproject 4fc10daa05477586fea99b6b3ca02a87d1102fa
diff --git a/gnulib/lib/xstriconveh.c b/gnulib/lib/xstriconveh.c
new file mode 100644
index 00000000..608e39c3
--- /dev/null
+++ b/gnulib/lib/xstriconveh.c
@@ -0,0 +1,86 @@
+/* Charset conversion with out-of-memory checking.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Written by Bruno Haible.
+
+   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.
+
+   This program 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/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "xstriconveh.h"
+
+#include <errno.h>
+
+#include "striconveh.h"
+#include "xalloc.h"
+
+
+#if HAVE_ICONV
+
+int
+xmem_cd_iconveh (const char *src, size_t srclen,
+                 const iconveh_t *cd,
+                 enum iconv_ilseq_handler handler,
+                 size_t *offsets,
+                 char **resultp, size_t *lengthp)
+{
+  int retval =
+    mem_cd_iconveh (src, srclen, cd, handler, offsets, resultp, lengthp);
+
+  if (retval < 0 && errno == ENOMEM)
+    xalloc_die ();
+  return retval;
+}
+
+char *
+xstr_cd_iconveh (const char *src,
+                 const iconveh_t *cd,
+                 enum iconv_ilseq_handler handler)
+{
+  char *result = str_cd_iconveh (src, cd, handler);
+
+  if (result == NULL && errno == ENOMEM)
+    xalloc_die ();
+  return result;
+}
+
+#endif
+
+int
+xmem_iconveh (const char *src, size_t srclen,
+              const char *from_codeset, const char *to_codeset,
+              enum iconv_ilseq_handler handler,
+              size_t *offsets,
+              char **resultp, size_t *lengthp)
+{
+  int retval =
+    mem_iconveh (src, srclen, from_codeset, to_codeset, handler, offsets,
+                 resultp, lengthp);
+
+  if (retval < 0 && errno == ENOMEM)
+    xalloc_die ();
+  return retval;
+}
+
+char *
+xstr_iconveh (const char *src,
+              const char *from_codeset, const char *to_codeset,
+              enum iconv_ilseq_handler handler)
+{
+  char *result = str_iconveh (src, from_codeset, to_codeset, handler);
+
+  if (result == NULL && errno == ENOMEM)
+    xalloc_die ();
+  return result;
+}