(iconv): Allow omitting output buffer if no input buffer is given to

place conversion descriptor in initial state.

diff --git a/iconv/iconv.c b/iconv/iconv.c
index a6c84367a7401dd868de3a22b31fc009c110ea98..a44525324992c196bae26ce89454cad7b3119bcc 100644 (file)
--- a/iconv/iconv.c
+++ b/iconv/iconv.c
@@ -38,9 +38,12 @@ iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
 
   if (inbuf == NULL || *inbuf == NULL)
     {
-      result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
-                       (unsigned char *) (outstart + *outbytesleft),
-                       &converted);
+      if (outbuf == NULL || *outbuf == NULL)
+       result = __gconv (gcd, NULL, NULL, NULL, NULL, &converted);
+      else
+       result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
+                         (unsigned char *) (outstart + *outbytesleft),
+                         &converted);
     }
   else
     {