X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=ef1ef49bb725421e0c0b0be8d8d2abf1b6adad62;hp=d2c2c2a09e92af9e77624fb08763c341d31c320f;hb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/send.c b/send.c
index d2c2c2a..ef1ef49 100644
--- a/send.c
+++ b/send.c
@@ -15,6 +15,9 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -22,7 +25,6 @@
 #include "rfc2047.h"
 #include "rfc3676.h"
 #include "keymap.h"
-#include "mime.h"
 #include "copy.h"
 #include "mx.h"
 #include "mutt_crypt.h"
@@ -75,7 +77,7 @@ static void append_signature (FILE * f)
 }
 
 /* compare two e-mail addresses and return 1 if they are equivalent */
-static int mutt_addrcmp (ADDRESS * a, ADDRESS * b)
+static int mutt_addrcmp (address_t * a, address_t * b)
 {
   if (!a->mailbox || !b->mailbox)
     return 0;
@@ -85,7 +87,7 @@ static int mutt_addrcmp (ADDRESS * a, ADDRESS * b)
 }
 
 /* search an e-mail address in a list */
-static int mutt_addrsrc (ADDRESS * a, ADDRESS * lst)
+static int mutt_addrsrc (address_t * a, address_t * lst)
 {
   for (; lst; lst = lst->next) {
     if (mutt_addrcmp (a, lst))
@@ -95,9 +97,9 @@ static int mutt_addrsrc (ADDRESS * a, ADDRESS * lst)
 }
 
 /* removes addresses from "b" which are contained in "a" */
-static ADDRESS *mutt_remove_xrefs (ADDRESS * a, ADDRESS * b)
+static address_t *mutt_remove_xrefs (address_t * a, address_t * b)
 {
-  ADDRESS *top, *p, *prev = NULL;
+  address_t *top, *p, *prev = NULL;
 
   top = b;
   while (b) {
@@ -130,9 +132,9 @@ static ADDRESS *mutt_remove_xrefs (ADDRESS * a, ADDRESS * b)
 /* remove any address which matches the current user.  if `leave_only' is
  * nonzero, don't remove the user's address if it is the only one in the list
  */
-static ADDRESS *remove_user (ADDRESS * a, int leave_only)
+static address_t *remove_user (address_t * a, int leave_only)
 {
-  ADDRESS *top = NULL, *last = NULL;
+  address_t *top = NULL, *last = NULL;
 
   while (a) {
     if (!mutt_addr_is_user (a)) {
@@ -146,7 +148,7 @@ static ADDRESS *remove_user (ADDRESS * a, int leave_only)
       last->next = NULL;
     }
     else {
-      ADDRESS *tmp = a;
+      address_t *tmp = a;
 
       a = a->next;
       if (!leave_only || a || last) {
@@ -160,9 +162,9 @@ static ADDRESS *remove_user (ADDRESS * a, int leave_only)
   return top;
 }
 
-static ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS * c)
+static address_t *find_mailing_lists (address_t * t, address_t * c)
 {
-  ADDRESS *top = NULL, *ptr = NULL;
+  address_t *top = NULL, *ptr = NULL;
 
   for (; t || c; t = c, c = NULL) {
     for (; t; t = t->next) {
@@ -179,7 +181,7 @@ static ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS * c)
   return top;
 }
 
-static int edit_address (ADDRESS ** a, const char *field)
+static int edit_address (address_t ** a, const char *field)
 {
   char buf[HUGE_STRING];
   char *err = NULL;
@@ -213,7 +215,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
 #ifdef USE_NNTP
   if (option (OPTNEWSSEND)) {
     if (en->newsgroups)
-      strfcpy (buf, en->newsgroups, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), en->newsgroups);
     else
       buf[0] = 0;
     if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
@@ -222,7 +224,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     en->newsgroups = m_strdup(buf);
 
     if (en->followup_to)
-      strfcpy (buf, en->followup_to, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), en->followup_to);
     else
       buf[0] = 0;
     if (option (OPTASKFOLLOWUP)
@@ -232,7 +234,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     en->followup_to = m_strdup(buf);
 
     if (en->x_comment_to)
-      strfcpy (buf, en->x_comment_to, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), en->x_comment_to);
     else
       buf[0] = 0;
     if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
@@ -256,7 +258,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     if (option (OPTFASTREPLY))
       return (0);
     else
-      strfcpy (buf, en->subject, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), en->subject);
   }
   else {
     char *p;
@@ -264,9 +266,8 @@ static int edit_envelope (ENVELOPE * en, int flags)
     buf[0] = 0;
     for (; uh; uh = uh->next) {
       if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) {
-        p = uh->data + 8;
-        SKIPWS (p);
-        strncpy (buf, p, sizeof (buf));
+        p = vskipspaces(uh->data + 8);
+        m_strcpy(buf, sizeof(buf), p);
       }
     }
   }
@@ -302,10 +303,9 @@ static int edit_envelope (ENVELOPE * en, int flags)
 }
 
 #ifdef USE_NNTP
-char *nntp_get_header (const char *s)
+char *nntp_get_header(const char *s)
 {
-  SKIPWS (s);
-  return m_strdup(s);
+    return m_strdup(skipspaces(s));
 }
 #endif
 
@@ -470,10 +470,10 @@ static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
   return 0;
 }
 
-static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
+static int default_to (address_t ** to, ENVELOPE * env, int flags, int hmfupto)
 {
   char prompt[STRING];
-  ADDRESS *tmp;
+  address_t *tmp;
 
   if (flags && env->mail_followup_to && hmfupto == M_YES) {
     rfc822_append (to, env->mail_followup_to);
@@ -557,7 +557,7 @@ static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
 int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
 {
   char prompt[STRING];
-  ADDRESS *tmp;
+  address_t *tmp;
   int hmfupto = -1;
 
   if ((flags & (SENDLISTREPLY | SENDGROUPREPLY)) && in->mail_followup_to) {
@@ -750,7 +750,7 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags)
     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
@@ -881,8 +881,8 @@ static int generate_body (FILE * tempfp,        /* stream for outgoing message *
 
 void mutt_set_followup_to (ENVELOPE * e)
 {
-  ADDRESS *t = NULL;
-  ADDRESS *from;
+  address_t *t = NULL;
+  address_t *from;
 
   /* 
    * Only generate the Mail-Followup-To if the user has requested it, and
@@ -946,9 +946,9 @@ void mutt_set_followup_to (ENVELOPE * e)
 /* look through the recipients of the message we are replying to, and if
    we find an address that matches $alternates, we use that as the default
    from field */
-static ADDRESS *set_reverse_name (ENVELOPE * env)
+static address_t *set_reverse_name (ENVELOPE * env)
 {
-  ADDRESS *tmp;
+  address_t *tmp;
 
   for (tmp = env->to; tmp; tmp = tmp->next) {
     if (mutt_addr_is_user (tmp))
@@ -972,9 +972,9 @@ static ADDRESS *set_reverse_name (ENVELOPE * env)
   return (tmp);
 }
 
-ADDRESS *mutt_default_from (void)
+address_t *mutt_default_from (void)
 {
-  ADDRESS *adr;
+  address_t *adr;
   const char *fqdn = mutt_fqdn (1);
 
   /*