Use p_new instead of xmalloc()

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index 6cd48b5..6ad7ed0 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -339,8 +339,8 @@ int mutt_write_mime_header (BODY * a, FILE * f)
 int mutt_write_mime_body (BODY * a, FILE * f)
 {
   const char *p;
-  char boundary[SHORT_STRING];
-  char send_charset[SHORT_STRING];
+  char boundary[STRING];
+  char send_charset[STRING];
   FILE *fpin;
   BODY *t;
   fgetconv_t *fc;
@@ -982,7 +982,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin)
 
       transform_to_7bit (a->parts, fpin);
     }
-    else if (mutt_is_message_type (a->type, a->subtype)) {
+    else if (mutt_is_message_type(a)) {
       mutt_message_to_7bit (a, fpin);
     }
     else {
@@ -1018,7 +1018,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin)
 /* determine which Content-Transfer-Encoding to use */
 static void mutt_set_encoding (BODY * b, CONTENT * info)
 {
-  char send_charset[SHORT_STRING];
+  char send_charset[STRING];
 
   if (b->type == TYPETEXT) {
     char *chsname =
@@ -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;
@@ -1653,8 +1650,8 @@ static void mutt_gen_localpart(char *buf, unsigned int len, const char *fmt)
 
 static char *mutt_gen_msgid (void)
 {
-    char buf[SHORT_STRING];
-    char localpart[SHORT_STRING];
+    char buf[STRING];
+    char localpart[STRING];
     const char *fqdn;
 
     if (!(fqdn = mutt_fqdn(0)))
@@ -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);
@@ -1845,8 +1840,7 @@ static int mutt_invoke_sendmail (address_t * from,        /* the sender */
   if (option (OPTNEWSSEND)) {
     char cmd[LONG_STRING];
 
-    mutt_FormatString (cmd, sizeof (cmd), NONULL (Inews), nntp_format_str, 0,
-                       0);
+    m_strformat(cmd, sizeof(cmd), 0, Inews, nntp_format_str, 0, 0);
     if (m_strisempty(cmd)) {
       i = nntp_post (msg);
       unlink (msg);
@@ -2005,20 +1999,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,
@@ -2026,7 +2020,7 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to,
 {
   int i, ret = 0;
   FILE *f;
-  char date[SHORT_STRING], tempfile[_POSIX_PATH_MAX];
+  char date[STRING], tempfile[_POSIX_PATH_MAX];
   MESSAGE *msg = NULL;
 
   if (!h) {
@@ -2087,12 +2081,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);
@@ -2153,8 +2147,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
   /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
    * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header() 
    * */
-  mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0,
-                            0);
+  mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post, 0);
 
   /* (postponment) if this was a reply of some sort, <msgid> contians the
    * Message-ID: of message replied to.  Save it using a special X-Mutt-
@@ -2172,8 +2165,6 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
     fprintf (msg->fp, "X-Mutt-Fcc: %s\n", fcc);
   fprintf (msg->fp, "Status: RO\n");
 
-
-
   /* (postponment) if the mail is to be signed or encrypted, save this info */
   if (post && (hdr->security & APPLICATION_PGP)) {
     fputs ("X-Mutt-PGP: ", msg->fp);
@@ -2261,8 +2252,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
     /* if there was an error, leave the temp version */
     if (!r)
       unlink (tempfile);
-  }
-  else {
+  } else {
     fputc ('\n', msg->fp);      /* finish off the header */
     r = mutt_write_mime_body (hdr->content, msg->fp);
   }