X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=b8ece6dee290dc8840f056e9971d72e0d685f7cb;hp=ff53c4566382a24764a17a27dc50f19485458d5d;hb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e;hpb=d031b12a6bfef909d3f4170a7b5e438f4dd5f67e

diff --git a/sendlib.c b/sendlib.c
index ff53c45..b8ece6d 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -1279,9 +1279,7 @@ mutt_write_address_list(address_t *addr, FILE *fp, int linelen, int display)
 
     while (addr) {
         char buf[LONG_STRING];
-        int len;
-
-        len = rfc822_write_address_single(buf, ssizeof(buf), addr, display);
+        int len = rfc822_addrcpy(buf, ssizeof(buf), addr, display);
 
         if (!first) {
             if (linelen + len > 74) {
@@ -1378,7 +1376,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
    */
   if (env->from && !privacy) {
     buffer[0] = 0;
-    rfc822_write_address (buffer, sizeof (buffer), env->from, 0);
+    rfc822_addrcat(buffer, sizeof(buffer), env->from, 0);
     fprintf (fp, "From: %s\n", buffer);
   }
 
@@ -1551,8 +1549,7 @@ const char *mutt_fqdn (short may_hide_host)
         p++;
 
       /* sanity check: don't hide the host if
-       * the fqdn is something like detebe.org.
-       */
+         the fqdn is something like detebe.org.  */
 
       if (!p || !(q = strchr (p, '.')))
         p = Fqdn;
@@ -1730,8 +1727,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile)
         /* redirect stderr to *tempfile too */
         if (dup (1) < 0)
           _exit (S_ERR);
-      }
-      else {
+      } else {
         if (open ("/dev/null", O_WRONLY | O_APPEND) < 0)        /* stdout */
           _exit (S_ERR);
         if (open ("/dev/null", O_RDWR | O_APPEND) < 0)  /* stderr */
@@ -1773,8 +1769,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile)
         unlink (*tempfile);     /* no longer needed */
         p_delete(tempfile);
       }
-    }
-    else {
+    } else {
       st = (SendmailWait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR;
       if (SendmailWait > 0) {
         unlink (*tempfile);
@@ -2005,20 +2000,20 @@ void mutt_prepare_envelope (ENVELOPE * env, int final)
 
 void mutt_unprepare_envelope (ENVELOPE * env)
 {
-  string_list_t *item;
+    string_list_t *item;
 
-  for (item = env->userhdrs; item; item = item->next)
-    rfc2047_decode (&item->data);
+    for (item = env->userhdrs; item; item = item->next)
+        rfc2047_decode(&item->data);
 
-  address_list_wipe(&env->mail_followup_to);
+    address_list_wipe(&env->mail_followup_to);
 
-  /* back conversions */
-  rfc2047_decode_adrlist (env->to);
-  rfc2047_decode_adrlist (env->cc);
-  rfc2047_decode_adrlist (env->bcc);
-  rfc2047_decode_adrlist (env->from);
-  rfc2047_decode_adrlist (env->reply_to);
-  rfc2047_decode (&env->subject);
+    /* back conversions */
+    rfc2047_decode_adrlist(env->to);
+    rfc2047_decode_adrlist(env->cc);
+    rfc2047_decode_adrlist(env->bcc);
+    rfc2047_decode_adrlist(env->from);
+    rfc2047_decode_adrlist(env->reply_to);
+    rfc2047_decode(&env->subject);
 }
 
 static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to,
@@ -2087,12 +2082,12 @@ int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to)
 
   rfc822_qualify(from, mutt_fqdn(1));
 
-  rfc2047_encode_adrlist (from, "Resent-From");
+  rfc2047_encode_adrlist(from, "Resent-From");
   if (mutt_addrlist_to_idna (from, &err)) {
     mutt_error (_("Bad IDN %s while preparing resent-from."), err);
     return -1;
   }
-  rfc822_write_address (resent_from, sizeof (resent_from), from, 0);
+  rfc822_addrcat(resent_from, sizeof(resent_from), from, 0);
 
 #ifdef USE_NNTP
   unset_option (OPTNEWSSEND);