Add rfc2047_encode_envelope helper.

diff --git a/rfc2047.c b/rfc2047.c
index a19e01b358333109d2d83e4ffbe04f5d0258505e..930e7c77dfb728e28dd73169cff43fb986113595 100644 (file)
--- 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 b61ab09e5f34f271c178e1a284b9b3f0d615858e..6565af6208cb80ca010562c2a3711e07715bbd93 100644 (file)
--- 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 a0a4c21b5608faed9993c4eac909fb7ea4c7e969..d1502978e7af79f294a068494d3b8eec437b63c3 100644 (file)
--- 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);
 }