X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=761054b1ba937d1a3cfc32ea600df84daeb4c6c5;hp=33b7e9ae04a2ef69365361863e68677a6f2fed5a;hb=69cbbd6ba2aec89f81ecf169e21b7bc4ec5bce90;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/sendlib.c b/sendlib.c
index 33b7e9a..761054b 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -25,7 +25,6 @@
 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_curses.h"
-#include "rfc2047.h"
 #include "mx.h"
 #include "copy.h"
 #include "pager.h"
@@ -297,7 +296,7 @@ int mutt_write_mime_header (BODY * a, FILE * f)
       buffer[0] = 0;
       tmp = m_strdup(p->value);
       encode = rfc2231_encode_string (&tmp);
-      rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
+      rfc822_strcpy(buffer, sizeof(buffer), tmp, MimeSpecials);
 
       /* Dirty hack to make messages readable by Outlook Express 
        * for the Mac: force quotes around the boundary parameter
@@ -349,7 +348,7 @@ int mutt_write_mime_header (BODY * a, FILE * f)
       buffer[0] = 0;
       tmp = m_strdup(t);
       encode = rfc2231_encode_string (&tmp);
-      rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
+      rfc822_strcpy(buffer, sizeof(buffer), tmp, MimeSpecials);
       p_delete(&tmp);
       fprintf (f, "; filename%s=%s", encode ? "*" : "", buffer);
     }
@@ -745,7 +744,7 @@ static size_t convert_file_from_to (FILE * file,
   for (c = tocodes, i = 0; c; c = c1 ? c1 + 1 : 0, i++) {
     if ((c1 = strchr (c, ':')) == c)
       continue;
-    tcode[i] = str_substrdup (c, c1);
+    tcode[i] = m_substrdup(c, c1);
   }
 
   ret = (size_t) (-1);
@@ -754,7 +753,7 @@ static size_t convert_file_from_to (FILE * file,
     for (c = fromcodes; c; c = c1 ? c1 + 1 : 0) {
       if ((c1 = strchr (c, ':')) == c)
         continue;
-      fcode = str_substrdup (c, c1);
+      fcode = m_substrdup(c, c1);
 
       ret = convert_file_to (file, fcode, ncodes, (const char **) tcode,
                              &cn, info);
@@ -938,7 +937,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
 
             for (q = p; *q && !ISSPACE (*q); q++);
 
-            str_substrcpy (subtype, p, q, sizeof (subtype));
+            m_strncpy(subtype, sizeof(subtype), p, q - p);
 
             if ((type = mutt_check_mime_type (ct)) == TYPEOTHER)
               m_strcpy(xtype, sizeof(xtype), ct);
@@ -956,8 +955,8 @@ bye:
 
   if (type != TYPEOTHER || *xtype != '\0') {
     att->type = type;
-    str_replace (&att->subtype, subtype);
-    str_replace (&att->xtype, xtype);
+    m_strreplace(&att->subtype, subtype);
+    m_strreplace(&att->xtype, xtype);
   }
 
   return (type);
@@ -2148,13 +2147,13 @@ void mutt_prepare_envelope (ENVELOPE * env, int final)
        * recipients if there is no To: or Cc: field, so attempt to suppress
        * it by using an empty To: field.
        */
-      env->to = rfc822_new_address ();
+      env->to = address_new ();
       env->to->group = 1;
-      env->to->next = rfc822_new_address ();
+      env->to->next = address_new ();
 
       buffer[0] = 0;
-      rfc822_cat (buffer, sizeof (buffer), "undisclosed-recipients",
-                  RFC822Specials);
+      rfc822_strcpy(buffer, sizeof(buffer), "undisclosed-recipients",
+                    RFC822Specials);
 
       env->to->mailbox = m_strdup(buffer);
     }
@@ -2190,7 +2189,7 @@ void mutt_unprepare_envelope (ENVELOPE * env)
   for (item = env->userhdrs; item; item = item->next)
     rfc2047_decode (&item->data);
 
-  rfc822_free_address (&env->mail_followup_to);
+  address_delete (&env->mail_followup_to);
 
   /* back conversions */
   rfc2047_decode_adrlist (env->to);
@@ -2282,7 +2281,7 @@ int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to)
 
   ret = _mutt_bounce_message (fp, h, to, resent_from, from);
 
-  rfc822_free_address (&from);
+  address_delete (&from);
 
   return ret;
 }
@@ -2311,7 +2310,7 @@ address_t *mutt_remove_duplicates (address_t * addr)
       *last = addr->next;
 
       addr->next = NULL;
-      rfc822_free_address (&addr);
+      address_delete (&addr);
 
       addr = *last;
     }