From 1add3e32c5b3eab069c74426aa019669fde9485c Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 3 Feb 2009 21:39:54 +0100
Subject: [PATCH] Revoked the iconv dummy of previous revision Solution was:  
 export CPPFLAGS="-I/usr/local/include"   export LDFLAGS="-L/usr/local/lib
 -liconv"   ./configure

---
 libisofs/util.c | 45 +--------------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/libisofs/util.c b/libisofs/util.c
index f928212..0e64ff2 100644
--- a/libisofs/util.c
+++ b/libisofs/util.c
@@ -18,6 +18,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <limits.h>
+#include <iconv.h>
 #include <locale.h>
 #include <langinfo.h>
 
@@ -31,50 +32,6 @@
 #endif
 
 
-/* ts A901203 */
-/* A dummy non-implementation of iconv API as used by libisofs.
-   Needed for FreeBSD experiments on a slightly misconfigured public server.
- #define Libisofs_iconv_dummY yes
-*/
-#ifdef Libisofs_iconv_dummY
-
-typedef int iconv_t;
-
-static
-iconv_t iconv_open(const char *tocode, const char *fromcode)
-{
-    return (iconv_t)(999);
-}
-static
-size_t iconv(iconv_t cd,
-             char **inbuf, size_t *inbytesleft,
-             char **outbuf, size_t *outbytesleft)
-{
-    size_t todo;
-
-    todo = *inbytesleft;
-    if (todo > *outbytesleft)
-        todo = *outbytesleft;
-    memcpy(*outbuf, *inbuf, todo);
-    *outbytesleft -= todo;
-    *outbuf += todo;
-    *inbuf -= todo;
-    *inbytesleft = 0;
-    return todo;
-}
-static
-int iconv_close(iconv_t cd)
-{
-    return 0;
-}
-
-#else /* Libisofs_iconv_dummY */
-
-#include <iconv.h>
-
-#endif /* ! Libisofs_iconv_dummY */
-
-
 int int_pow(int base, int power)
 {
     int result = 1;