From a4788d5ea60f36fa60864d71e6adbd93c3ecb86b Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 26 Nov 1999 06:18:29 +0000
Subject: [PATCH] (process_block): For stateful charsets write out byte
 sequence to get to initial state at the end of the file.

---
 iconv/iconv_prog.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index fa22605919..f17c462387 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -334,8 +334,32 @@ conversion stopped due to problem in writing the output"));
 	}
 
       if (n != (size_t) -1)
-	/* Everything is processed.  */
-	break;
+	{
+	  /* All the input test is processed.  For state-dependent
+             character sets we have to flush the state now.  */
+	  outptr = outbuf;
+	  outlen = OUTBUF_SIZE;
+	  n = iconv (cd, NULL, NULL, &outptr, &outlen);
+
+	  if (outptr != outbuf)
+	    {
+	      /* We have something to write out.  */
+	      int errno_save = errno;
+
+	      if (fwrite (outbuf, 1, outptr - outbuf, output) < outptr - outbuf
+		  || ferror (output))
+		{
+		  /* Error occurred while printing the result.  */
+		  error (0, 0, _("\
+conversion stopped due to problem in writing the output"));
+		  return -1;
+		}
+
+	      errno = errno_save;
+	    }
+
+	  break;
+	}
 
       if (errno != E2BIG)
 	{