[PATCH 6/6] Convert pgp_application_pgp_handler() to perform textmode conversion.

[Kevin J. McCarthy]

Since this output if from fgetconv() and doesn't interface with the
library function, use a simple converter embedded in the function.
---
 pgp.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pgp.c b/pgp.c
index c8543124..1379d08b 100644
--- a/pgp.c
+++ b/pgp.c
@@ -624,7 +624,7 @@ int pgp_application_pgp_handler (BODY *m, STATE *s)
       else if (pgpout)
       {
         FGETCONV *fc;
-        int c;
+        int c, has_cr = 0;
         char *expected_charset = gpgcharset && *gpgcharset ? gpgcharset : 
"utf-8";
 
         muttdbg(4, "pgp: recoding inline from [%s] to [%s]",
@@ -634,7 +634,21 @@ int pgp_application_pgp_handler (BODY *m, STATE *s)
         state_set_prefix (s);
         fc = fgetconv_open (pgpout, expected_charset, Charset, 
MUTT_ICONV_HOOK_FROM);
         while ((c = fgetconv (fc)) != EOF)
-          state_prefix_putc (c, s);
+        {
+          /* lazy crlf -> lf conversion */
+          if (has_cr)
+          {
+            if (c != '\n')
+              state_prefix_putc ('\r', s);
+            has_cr = 0;
+          }
+          if (c == '\r')
+            has_cr = 1;
+          else
+            state_prefix_putc (c, s);
+        }
+        if (has_cr)
+          state_prefix_putc ('\r', s);
         fgetconv_close (&fc);
       }
 
-- 
2.53.0