Merge changes from the haible-private branch.

diff --git a/ChangeLog b/ChangeLog
index a5af990644608bf7656a9b2d3c2d91d716eefec7..43e2fd54b675b20f484ad21c2e67364d4fdc1814 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-12-12  Bruno Haible  <bruno@clisp.org>
+
+       Merge these changes.
+       2006-09-05  Bruno Haible  <bruno@clisp.org>
+       * lib/iconvme.c (iconv_string): No need to save and restore errno when
+       iconv_alloc succeeded.
+       (iconv_alloc): Don't assume that malloc() or realloc(), when failing,
+       sets errno to ENOMEM. (malloc on GNU/kFreeBSD doesn't.) No need to
+       test for " && dest " at the end - dest is always != NULL there. Call
+       iconv with 4xNULL arguments initially, to reset the state. Call iconv
+       with 2xNULL arguments, also to flush the state storage. Handle the
+       IRIX iconv behaviour. Realloc the final result, to throw away unused
+       memory.
+
 2006-12-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        * m4/openat.m4 (gl_FUNC_OPENAT): Don't compile mkdirat

diff --git a/lib/iconvme.c b/lib/iconvme.c
index 555205ccdc9888eaffe452e0465dbc6b4319ab8b..7403242ba0e75b9e158951a8f14751dd19fbc607 100644 (file)
--- a/lib/iconvme.c
+++ b/lib/iconvme.c
@@ -73,21 +73,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 +129,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 +167,7 @@ again:
            newdest = (char *) realloc (dest, newsize);
            if (newdest == NULL)
              {
+               errno = ENOMEM;
                have_error = 1;
                goto out;
              }
@@ -176,11 +190,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
+
+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';
 
-  *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);