X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ficonvme.c;h=0018aa308be5a53641ee527713ee308714027b4a;hb=d2b0c77abf5b72cbf78ec4e4e404c851950b0fef;hp=555205ccdc9888eaffe452e0465dbc6b4319ab8b;hpb=a42e0dae2fe2bc4d1166d572e8b5b447de9b9873;p=gnulib.git

diff --git a/lib/iconvme.c b/lib/iconvme.c
index 555205ccd..0018aa308 100644
--- a/lib/iconvme.c
+++ b/lib/iconvme.c
@@ -23,7 +23,7 @@
 /* Get malloc. */
 #include <stdlib.h>
 
-/* Get strcmp. */
+/* Get strcmp, strdup. */
 #include <string.h>
 
 /* Get errno. */
@@ -31,9 +31,6 @@
 
 #ifdef _LIBC
 # define HAVE_ICONV 1
-#else
-/* Get strdup. */
-# include "strdup.h"
 #endif
 
 #if HAVE_ICONV
@@ -73,21 +70,24 @@ iconv_string (const char *str, const char *from_codeset,
 
   dest = iconv_alloc (cd, str);
 
-  {
-    int save_errno = errno;
-
-    if (iconv_close (cd) < 0 && dest)
-      {
-	int save_errno2 = errno;
-	/* If we didn't have a real error before, make sure we restore
-	   the iconv_close error below. */
-	free (dest);
-	dest = NULL;
-	errno = save_errno2;
-      }
-    else
-      errno = save_errno;
-  }
+  if (dest == NULL)
+    {
+      int saved_errno = errno;
+      iconv_close (cd);
+      errno = saved_errno;
+    }
+  else
+    {
+      if (iconv_close (cd) < 0)
+	{
+	  int saved_errno2 = errno;
+	  /* If we didn't have a real error before, make sure we restore
+	     the iconv_close error below. */
+	  free (dest);
+	  dest = NULL;
+	  errno = saved_errno2;
+	}
+    }
 #else
   errno = ENOSYS;
 #endif
@@ -126,7 +126,17 @@ iconv_alloc (iconv_t cd, const char *str)
 
   outp = dest = (char *) malloc (outbuf_size);
   if (dest == NULL)
-    return NULL;
+    {
+      errno = ENOMEM;
+      return NULL;
+    }
+
+  /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
+# if defined _LIBICONV_VERSION \
+    || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
+  /* Set to the initial state.  */
+  iconv (cd, NULL, NULL, NULL, NULL);
+# endif
 
 again:
   err = iconv (cd, &p, &inbytes_remaining, &outp, &outbytes_remaining);
@@ -154,6 +164,7 @@ again:
 	    newdest = (char *) realloc (dest, newsize);
 	    if (newdest == NULL)
 	      {
+		errno = ENOMEM;
 		have_error = 1;
 		goto out;
 	      }
@@ -176,11 +187,80 @@ again:
 	  break;
 	}
     }
+# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi)
+  /* Irix iconv() inserts a NUL byte if it cannot convert.  */
+  else if (err > 0)
+    {
+      errno = EILSEQ;
+      have_error = 1;
+      goto out;
+    }
+# endif
 
-  *outp = '\0';
+again2:
+  err = iconv (cd, NULL, NULL, &outp, &outbytes_remaining);
+
+  if (err == (size_t) -1)
+    {
+      switch (errno)
+	{
+	case E2BIG:
+	  {
+	    size_t used = outp - dest;
+	    size_t newsize = outbuf_size * 2;
+	    char *newdest;
+
+	    if (newsize <= outbuf_size)
+	      {
+		errno = ENOMEM;
+		have_error = 1;
+		goto out;
+	      }
+	    newdest = (char *) realloc (dest, newsize);
+	    if (newdest == NULL)
+	      {
+		errno = ENOMEM;
+		have_error = 1;
+		goto out;
+	      }
+	    dest = newdest;
+	    outbuf_size = newsize;
+
+	    outp = dest + used;
+	    outbytes_remaining = outbuf_size - used - 1;	/* -1 for NUL */
+
+	    goto again2;
+	  }
+	  break;
+
+	default:
+	  have_error = 1;
+	  break;
+	}
+    }
+# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi)
+  /* Irix iconv() inserts a NUL byte if it cannot convert.  */
+  else if (err > 0)
+    {
+      errno = EILSEQ;
+      have_error = 1;
+      goto out;
+    }
+# endif
+
+  *outp++ = '\0';
+
+  /* Give away unused memory.  */
+  if (outp - dest < outbuf_size)
+    {
+      char *newdest = (char *) realloc (dest, outp - dest);
+
+      if (newdest != NULL)
+	dest = newdest;
+    }
 
 out:
-  if (have_error && dest)
+  if (have_error)
     {
       int save_errno = errno;
       free (dest);