From: Kevin McCarthy <kevin@8t8.us>
Date: Sun, 16 Dec 2018 22:23:54 +0000 (-0800)
Subject: Add rfc2047_encode_envelope helper.
X-Git-Tag: mutt-1-12-rel~179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04a08e2d89b8fbb0f49a8154036a22892da28c3b;p=mutt

Add rfc2047_encode_envelope helper.
---

diff --git a/rfc2047.c b/rfc2047.c
index a19e01b3..930e7c77 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -623,6 +623,19 @@ void rfc2047_encode_adrlist (ADDRESS *addr, const char *tag)
   }
 }
 
+void rfc2047_encode_envelope (ENVELOPE *e)
+{
+  rfc2047_encode_adrlist (e->from, "From");
+  rfc2047_encode_adrlist (e->to, "To");
+  rfc2047_encode_adrlist (e->cc, "Cc");
+  rfc2047_encode_adrlist (e->bcc, "Bcc");
+  rfc2047_encode_adrlist (e->reply_to, "Reply-To");
+  rfc2047_encode_adrlist (e->mail_followup_to, "Mail-Followup-To");
+  rfc2047_encode_adrlist (e->sender, "Sender");
+  rfc2047_encode_string (&e->x_label);
+  rfc2047_encode_string (&e->subject);
+}
+
 static int rfc2047_decode_word (BUFFER *d, const char *s, char **charset)
 {
   const char *pp, *pp1;
diff --git a/rfc2047.h b/rfc2047.h
index b61ab09e..6565af62 100644
--- a/rfc2047.h
+++ b/rfc2047.h
@@ -22,6 +22,7 @@ int convert_nonmime_string (char **);
 
 void _rfc2047_encode_string (char **, int, int);
 void rfc2047_encode_adrlist (ADDRESS *, const char *);
+void rfc2047_encode_envelope (ENVELOPE *);
 
 #define rfc2047_encode_string(a) _rfc2047_encode_string (a, 0, 32);
 
diff --git a/sendlib.c b/sendlib.c
index a0a4c21b..d1502978 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -2549,18 +2549,7 @@ void mutt_prepare_envelope (ENVELOPE *env, int final)
   }
 
   /* Take care of 8-bit => 7-bit conversion. */
-  rfc2047_encode_adrlist (env->to, "To");
-  rfc2047_encode_adrlist (env->cc, "Cc");
-  rfc2047_encode_adrlist (env->bcc, "Bcc");
-  rfc2047_encode_adrlist (env->from, "From");
-  rfc2047_encode_adrlist (env->mail_followup_to, "Mail-Followup-To");
-  rfc2047_encode_adrlist (env->reply_to, "Reply-To");
-  rfc2047_encode_string (&env->x_label);
-
-  if (env->subject)
-  {
-    rfc2047_encode_string (&env->subject);
-  }
+  rfc2047_encode_envelope (env);
   encode_headers (env->userhdrs);
 }