X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=3ea036316ea83215d6d2dc93865877f626dd223b;hp=fec63fe83b307a0cd5856f8db178fbfee3fb5fe2;hb=d5d56308b49c3f157a17125415312f0c13e1e25b;hpb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7

diff --git a/recvcmd.c b/recvcmd.c
index fec63fe..3ea0363 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -15,6 +15,9 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -24,9 +27,7 @@
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
-#include "mime.h"
 #include "attach.h"
-#include "mapping.h"
 #include "mx.h"
 #include "copy.h"
 #include "mutt_idna.h"
@@ -125,7 +126,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   char prompt[STRING];
   char buf[HUGE_STRING];
   char *err = NULL;
-  ADDRESS *adr = NULL;
+  address_t *adr = NULL;
   int ret = 0;
   int p = 0;
 
@@ -136,9 +137,9 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   p = (cur || count_tagged (idx, idxlen) == 1);
 
   if (p)
-    strfcpy (prompt, _("Bounce message to: "), sizeof (prompt));
+    m_strcpy(prompt, sizeof(prompt), _("Bounce message to: "));
   else
-    strfcpy (prompt, _("Bounce tagged messages to: "), sizeof (prompt));
+    m_strcpy(prompt, sizeof(prompt), _("Bounce tagged messages to: "));
 
   buf[0] = '\0';
   if (mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS)
@@ -156,7 +157,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
     p_delete(&err);
-    rfc822_free_address (&adr);
+    address_delete (&adr);
     return;
   }
 
@@ -181,7 +182,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   }
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-    rfc822_free_address (&adr);
+    address_delete (&adr);
     CLEARLINE (LINES - 1);
     mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
     return;
@@ -316,12 +317,12 @@ static void include_header (int quote, FILE * ifp,
 
   if (quote) {
     if (_prefix)
-      strfcpy (prefix, _prefix, sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), _prefix);
     else if (!option (OPTTEXTFLOWED))
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
                          Context, hdr, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
 
     chflags |= CH_PREFIX;
   }
@@ -387,8 +388,8 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
     parent = hdr;
 
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, parent);
 
   mutt_mktemp (tmpbody);
@@ -406,7 +407,7 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
                          parent, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
   }
 
   include_header (option (OPTFORWQUOTE), fp, parent, tmpfp, prefix);
@@ -506,7 +507,7 @@ bail:
     mutt_unlink (tmpbody);
   }
 
-  mutt_free_header (&tmphdr);
+  header_delete(&tmphdr);
 }
 
 
@@ -547,8 +548,8 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
       }
   }
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, curhdr);
 
 
@@ -562,7 +563,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
     mutt_mktemp (tmpbody);
     if (!(tmpfp = safe_fopen (tmpbody, "w"))) {
       mutt_error (_("Can't create %s."), tmpbody);
-      mutt_free_header (&tmphdr);
+      header_delete(&tmphdr);
       return;
     }
 
@@ -614,7 +615,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
     }
   }
   else
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
 
   ci_send_message (flags, tmphdr, *tmpbody ? tmpbody : NULL, NULL, curhdr);
 
@@ -689,7 +690,7 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
   if ((flags & SENDNEWS)) {
     /* in case followup set Newsgroups: with Followup-To: if it present */
     if (!env->newsgroups && curenv &&
-        str_casecmp (curenv->followup_to, "poster"))
+        m_strcasecmp(curenv->followup_to, "poster"))
       env->newsgroups = m_strdup(curenv->followup_to);
   }
   else
@@ -799,21 +800,21 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   else if (nattach == 1)
     mime_reply_any = 1;
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
 
   if (attach_reply_envelope_defaults (tmphdr->env, idx, idxlen,
                                       parent ? parent : (cur ? cur->
                                                          hdr : NULL),
                                       flags) == -1) {
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
     return;
   }
 
   mutt_mktemp (tmpbody);
   if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) {
     mutt_error (_("Can't create %s."), tmpbody);
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
     return;
   }
 
@@ -838,7 +839,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
                          Context, parent, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
 
     st.prefix = prefix;
     st.flags = M_CHARCONV;
@@ -871,7 +872,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
     if (mime_reply_any && !cur &&
         copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
                                       0) == NULL) {
-      mutt_free_header (&tmphdr);
+      header_delete(&tmphdr);
       fclose (tmpfp);
       return;
     }