X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=b3f08b8e2971919f94c3a2a893a67512b57e8eb7;hp=12f8df52badd938ab353b6433dda2424fe0a27e4;hb=1601b25fd310dd65a6b6d1b49f2e16f55560ac9d;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/sendlib.c b/sendlib.c
index 12f8df5..b3f08b8 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -14,6 +14,9 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
+#include "recvattach.h"
 #include "mutt_curses.h"
 #include "rfc2047.h"
 #include "rfc2231.h"
@@ -24,6 +27,7 @@
 #include "charset.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
+#include "svnrev.h"
 
 #include "lib/mem.h"
 #include "lib/str.h"
@@ -66,77 +70,6 @@
 
 extern char RFC822Specials[];
 
-static struct sysexits {
-  int v;
-  const char *str;
-} sysexits_h[] = {
-#ifdef EX_USAGE
-  {
-  0xff & EX_USAGE, "Bad usage."},
-#endif
-#ifdef EX_DATAERR
-  {
-  0xff & EX_DATAERR, "Data format error."},
-#endif
-#ifdef EX_NOINPUT
-  {
-  0xff & EX_NOINPUT, "Cannot open input."},
-#endif
-#ifdef EX_NOUSER
-  {
-  0xff & EX_NOUSER, "User unknown."},
-#endif
-#ifdef EX_NOHOST
-  {
-  0xff & EX_NOHOST, "Host unknown."},
-#endif
-#ifdef EX_UNAVAILABLE
-  {
-  0xff & EX_UNAVAILABLE, "Service unavailable."},
-#endif
-#ifdef EX_SOFTWARE
-  {
-  0xff & EX_SOFTWARE, "Internal error."},
-#endif
-#ifdef EX_OSERR
-  {
-  0xff & EX_OSERR, "Operating system error."},
-#endif
-#ifdef EX_OSFILE
-  {
-  0xff & EX_OSFILE, "System file missing."},
-#endif
-#ifdef EX_CANTCREAT
-  {
-  0xff & EX_CANTCREAT, "Can't create output."},
-#endif
-#ifdef EX_IOERR
-  {
-  0xff & EX_IOERR, "I/O error."},
-#endif
-#ifdef EX_TEMPFAIL
-  {
-  0xff & EX_TEMPFAIL, "Deferred."},
-#endif
-#ifdef EX_PROTOCOL
-  {
-  0xff & EX_PROTOCOL, "Remote protocol error."},
-#endif
-#ifdef EX_NOPERM
-  {
-  0xff & EX_NOPERM, "Insufficient permission."},
-#endif
-#ifdef EX_CONFIG
-  {
-  0xff & EX_NOPERM, "Local configuration error."},
-#endif
-  {
-  S_ERR, "Exec error."}, {
-  -1, NULL}
-};
-
-
-
 #define DISPOSITION(X) X==DISPATTACH?"attachment":"inline"
 
 const char MimeSpecials[] = "@.,;:<>[]\\\"()?/= \t";
@@ -187,11 +120,11 @@ static void encode_quoted (FGETCONV * fc, FILE * fout, int istext)
     }
 
     /* Escape lines that begin with/only contain "the message separator". */
-    if (linelen == 4 && !safe_strncmp ("From", line, 4)) {
+    if (linelen == 4 && !str_ncmp ("From", line, 4)) {
       strfcpy (line, "=46rom", sizeof (line));
       linelen = 6;
     }
-    else if (linelen == 4 && !safe_strncmp ("from", line, 4)) {
+    else if (linelen == 4 && !str_ncmp ("from", line, 4)) {
       strfcpy (line, "=66rom", sizeof (line));
       linelen = 6;
     }
@@ -362,7 +295,7 @@ int mutt_write_mime_header (BODY * a, FILE * f)
   fprintf (f, "Content-Type: %s/%s", TYPE (a), a->subtype);
 
   if (a->parameter) {
-    len = 25 + safe_strlen (a->subtype);        /* approximate len. of content-type */
+    len = 25 + str_len (a->subtype);        /* approximate len. of content-type */
 
     for (p = a->parameter; p; p = p->next) {
       char *tmp;
@@ -373,7 +306,7 @@ int mutt_write_mime_header (BODY * a, FILE * f)
       fputc (';', f);
 
       buffer[0] = 0;
-      tmp = safe_strdup (p->value);
+      tmp = str_dup (p->value);
       encode = rfc2231_encode_string (&tmp);
       rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
 
@@ -386,9 +319,9 @@ int mutt_write_mime_header (BODY * a, FILE * f)
           && !strcmp (buffer, tmp))
         snprintf (buffer, sizeof (buffer), "\"%s\"", tmp);
 
-      FREE (&tmp);
+      mem_free (&tmp);
 
-      tmplen = safe_strlen (buffer) + safe_strlen (p->attribute) + 1;
+      tmplen = str_len (buffer) + str_len (p->attribute) + 1;
 
       if (len + tmplen + 2 > 76) {
         fputs ("\n\t", f);
@@ -425,10 +358,10 @@ int mutt_write_mime_header (BODY * a, FILE * f)
         t = fn;
 
       buffer[0] = 0;
-      tmp = safe_strdup (t);
+      tmp = str_dup (t);
       encode = rfc2231_encode_string (&tmp);
       rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
-      FREE (&tmp);
+      mem_free (&tmp);
       fprintf (f, "; filename%s=%s", encode ? "*" : "", buffer);
     }
   }
@@ -479,7 +412,7 @@ int mutt_write_mime_body (BODY * a, FILE * f)
   /* This is pretty gross, but it's the best solution for now... */
   if ((WithCrypto & APPLICATION_PGP)
       && a->type == TYPEAPPLICATION
-      && safe_strcmp (a->subtype, "pgp-encrypted") == 0) {
+      && str_cmp (a->subtype, "pgp-encrypted") == 0) {
     fputs ("Version: 1\n", f);
     return 0;
   }
@@ -684,10 +617,10 @@ static size_t convert_file_to (FILE * file, const char *fromcode,
   if (cd1 == (iconv_t) (-1))
     return -1;
 
-  cd = safe_calloc (ncodes, sizeof (iconv_t));
-  score = safe_calloc (ncodes, sizeof (size_t));
-  states = safe_calloc (ncodes, sizeof (CONTENT_STATE));
-  infos = safe_calloc (ncodes, sizeof (CONTENT));
+  cd = mem_calloc (ncodes, sizeof (iconv_t));
+  score = mem_calloc (ncodes, sizeof (size_t));
+  states = mem_calloc (ncodes, sizeof (CONTENT_STATE));
+  infos = mem_calloc (ncodes, sizeof (CONTENT));
 
   for (i = 0; i < ncodes; i++)
     if (ascii_strcasecmp (tocodes[i], "UTF-8"))
@@ -777,10 +710,10 @@ static size_t convert_file_to (FILE * file, const char *fromcode,
       iconv_close (cd[i]);
 
   iconv_close (cd1);
-  FREE (&cd);
-  FREE (&infos);
-  FREE (&score);
-  FREE (&states);
+  mem_free (&cd);
+  mem_free (&infos);
+  mem_free (&score);
+  mem_free (&states);
 
   return ret;
 #else
@@ -819,7 +752,7 @@ static size_t convert_file_from_to (FILE * file,
   }
 
   /* Copy them */
-  tcode = safe_malloc (ncodes * sizeof (char *));
+  tcode = mem_malloc (ncodes * sizeof (char *));
   for (c = tocodes, i = 0; c; c = c1 ? c1 + 1 : 0, i++) {
     if ((c1 = strchr (c, ':')) == c)
       continue;
@@ -842,7 +775,7 @@ static size_t convert_file_from_to (FILE * file,
         tcode[cn] = 0;
         break;
       }
-      FREE (&fcode);
+      mem_free (&fcode);
     }
   }
   else {
@@ -857,9 +790,9 @@ static size_t convert_file_from_to (FILE * file,
 
   /* Free memory */
   for (i = 0; i < ncodes; i++)
-    FREE (&tcode[i]);
+    mem_free (&tcode[i]);
 
-  FREE (tcode);
+  mem_free (tcode);
 
   return ret;
 }
@@ -873,7 +806,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
   CONTENT *info;
   CONTENT_STATE state;
   FILE *fp = NULL;
-  char *fromcode;
+  char *fromcode = NULL;
   char *tocode;
   char buffer[100];
   char chsbuf[STRING];
@@ -899,7 +832,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
     return (NULL);
   }
 
-  info = safe_calloc (1, sizeof (CONTENT));
+  info = mem_calloc (1, sizeof (CONTENT));
   memset (&state, 0, sizeof (state));
 
   if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) {
@@ -914,7 +847,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
         mutt_set_parameter ("charset", chsbuf, &b->parameter);
       }
       b->file_charset = fromcode;
-      FREE (&tocode);
+      mem_free (&tocode);
       safe_fclose (&fp);
       return info;
     }
@@ -958,7 +891,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
   type = TYPEOTHER;
   cur_sze = 0;
 
-  szf = safe_strlen (path);
+  szf = str_len (path);
 
   for (count = 0; count < 3; count++) {
     /*
@@ -998,9 +931,9 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
 
         /* cycle through the file extensions */
         while ((p = strtok (p, " \t\n"))) {
-          sze = safe_strlen (p);
+          sze = str_len (p);
           if ((sze > cur_sze) && (szf >= sze) &&
-              (safe_strcasecmp (path + szf - sze, p) == 0
+              (str_casecmp (path + szf - sze, p) == 0
                || ascii_strcasecmp (path + szf - sze, p) == 0) && (szf == sze
                                                                    || path[szf
                                                                            -
@@ -1086,7 +1019,7 @@ void mutt_message_to_7bit (BODY * a, FILE * fp)
   mutt_write_mime_body (a->parts, fpout);
 
 cleanup:
-  FREE (&line);
+  mem_free (&line);
 
   if (fpin && !fp)
     fclose (fpin);
@@ -1099,7 +1032,7 @@ cleanup:
   a->d_filename = a->filename;
   if (a->filename && a->unlink)
     unlink (a->filename);
-  a->filename = safe_strdup (temp);
+  a->filename = str_dup (temp);
   a->unlink = 1;
   if (stat (a->filename, &sb) == -1) {
     mutt_perror ("stat");
@@ -1140,7 +1073,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin)
       mutt_decode_attachment (a, &s);
       fclose (s.fpout);
       a->d_filename = a->filename;
-      a->filename = safe_strdup (buff);
+      a->filename = str_dup (buff);
       a->unlink = 1;
       if (stat (a->filename, &sb) == -1) {
         mutt_perror ("stat");
@@ -1250,7 +1183,7 @@ void mutt_update_encoding (BODY * a)
   mutt_set_encoding (a, info);
   mutt_stamp_attachment (a);
 
-  FREE (&a->content);
+  mem_free (&a->content);
   a->content = info;
 
 }
@@ -1277,8 +1210,8 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
 
   body = mutt_new_body ();
   body->type = TYPEMESSAGE;
-  body->subtype = safe_strdup ("rfc822");
-  body->filename = safe_strdup (buffer);
+  body->subtype = str_dup ("rfc822");
+  body->filename = str_dup (buffer);
   body->unlink = 1;
   body->use_disp = 0;
   body->disposition = DISPINLINE;
@@ -1344,7 +1277,7 @@ BODY *mutt_make_file_attach (const char *path)
   CONTENT *info;
 
   att = mutt_new_body ();
-  att->filename = safe_strdup (path);
+  att->filename = str_dup (path);
 
   /* Attempt to determine the appropriate content-type based on the filename
    * suffix.
@@ -1356,8 +1289,8 @@ BODY *mutt_make_file_attach (const char *path)
        mutt_lookup_mime_type (buf, sizeof (buf), xbuf, sizeof (xbuf),
                               path)) != TYPEOTHER || *xbuf != '\0') {
     att->type = n;
-    att->subtype = safe_strdup (buf);
-    att->xtype = safe_strdup (xbuf);
+    att->subtype = str_dup (buf);
+    att->xtype = str_dup (xbuf);
   }
 
 #else
@@ -1379,11 +1312,11 @@ BODY *mutt_make_file_attach (const char *path)
        * chars if this is really a binary file...
        */
       att->type = TYPETEXT;
-      att->subtype = safe_strdup ("plain");
+      att->subtype = str_dup ("plain");
     }
     else {
       att->type = TYPEAPPLICATION;
-      att->subtype = safe_strdup ("octet-stream");
+      att->subtype = str_dup ("octet-stream");
     }
   }
 
@@ -1411,7 +1344,7 @@ BODY *mutt_make_multipart (BODY * b)
 
   new = mutt_new_body ();
   new->type = TYPEMULTIPART;
-  new->subtype = safe_strdup ("mixed");
+  new->subtype = str_dup ("mixed");
   new->encoding = get_toplevel_encoding (b);
   mutt_generate_boundary (&new->parameter);
   new->use_disp = 0;
@@ -1465,7 +1398,7 @@ void mutt_write_address_list (ADDRESS * adr, FILE * fp, int linelen,
     adr->next = NULL;
     buf[0] = 0;
     rfc822_write_address (buf, sizeof (buf), adr, display);
-    len = safe_strlen (buf);
+    len = str_len (buf);
     if (count && linelen + len > 74) {
       fputs ("\n\t", fp);
       linelen = len + 8;        /* tab is usually about 8 spaces... */
@@ -1504,7 +1437,7 @@ void mutt_write_references (LIST * r, FILE * f)
 
   for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) {
     if (refcnt == refmax)
-      safe_realloc (&ref, (refmax += REF_INC) * sizeof (LIST *));
+      mem_realloc (&ref, (refmax += REF_INC) * sizeof (LIST *));
     ref[refcnt++] = r;
   }
 
@@ -1513,7 +1446,7 @@ void mutt_write_references (LIST * r, FILE * f)
     fputs (ref[refcnt]->data, f);
   }
 
-  FREE (&ref);
+  mem_free (&ref);
 }
 
 /* Note: all RFC2047 encoding should be done outside of this routine, except
@@ -1683,7 +1616,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
       }
     }
     /* Add a vanity header */
-    fprintf (fp, "User-Agent: mutt-ng %s (%s)\n", MUTT_VERSION, os);
+    fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os);
   }
 
   return (ferror (fp) == 0 ? 0 : -1);
@@ -1702,18 +1635,18 @@ static void encode_headers (LIST * h)
     i = p - h->data;
     ++p;
     SKIPWS (p);
-    tmp = safe_strdup (p);
+    tmp = str_dup (p);
 
     if (!tmp)
       continue;
 
     rfc2047_encode_string (&tmp);
-    safe_realloc (&h->data,
-                  safe_strlen (h->data) + 2 + safe_strlen (tmp) + 1);
+    mem_realloc (&h->data,
+                  str_len (h->data) + 2 + str_len (tmp) + 1);
 
     sprintf (h->data + i, ": %s", NONULL (tmp));        /* __SPRINTF_CHECKED__ */
 
-    FREE (&tmp);
+    mem_free (&tmp);
   }
 }
 
@@ -1767,62 +1700,62 @@ static void mutt_gen_localpart (char *buf, unsigned int len, char *fmt)
         return;
       case 'd':
         snprintf (tmp, sizeof (tmp), "%02d", tm->tm_mday);
-        safe_strncat (buf, len, tmp, 2);
+        str_ncat (buf, len, tmp, 2);
         break;
       case 'h':
         snprintf (tmp, sizeof (tmp), "%02d", tm->tm_hour);
-        safe_strncat (buf, len, tmp, 2);
+        str_ncat (buf, len, tmp, 2);
         break;
       case 'm':
         snprintf (tmp, sizeof (tmp), "%02d", tm->tm_mon + 1);
-        safe_strncat (buf, len, tmp, 2);
+        str_ncat (buf, len, tmp, 2);
         break;
       case 'M':
         snprintf (tmp, sizeof (tmp), "%02d", tm->tm_min);
-        safe_strncat (buf, len, tmp, 2);
+        str_ncat (buf, len, tmp, 2);
         break;
       case 'O':
         snprintf (tmp, sizeof (tmp), "%lo", (unsigned long) now);
-        safe_strncat (buf, len, tmp, safe_strlen (tmp));
+        str_ncat (buf, len, tmp, str_len (tmp));
         break;
       case 'p':
         snprintf (tmp, sizeof (tmp), "%u", (unsigned int) getpid ());
-        safe_strncat (buf, len, tmp, safe_strlen (tmp));
+        str_ncat (buf, len, tmp, str_len (tmp));
         break;
       case 'P':
         snprintf (tmp, sizeof (tmp), "%c", MsgIdPfx);
         MsgIdPfx = (MsgIdPfx == 'Z') ? 'A' : MsgIdPfx + 1;
-        safe_strncat (buf, len, tmp, 1);
+        str_ncat (buf, len, tmp, 1);
         break;
       case 'r':
         snprintf (tmp, sizeof (tmp), "%u", (unsigned int) rand ());
-        safe_strncat (buf, len, tmp, safe_strlen (tmp));
+        str_ncat (buf, len, tmp, str_len (tmp));
         break;
       case 'R':
         snprintf (tmp, sizeof (tmp), "%x", (unsigned int) rand ());
-        safe_strncat (buf, len, tmp, safe_strlen (tmp));
+        str_ncat (buf, len, tmp, str_len (tmp));
         break;
       case 's':
         snprintf (tmp, sizeof (tmp), "%02d", tm->tm_sec);
-        safe_strncat (buf, len, tmp, 2);
+        str_ncat (buf, len, tmp, 2);
         break;
       case 'T':
         snprintf (tmp, sizeof (tmp), "%u", (unsigned int) now);
-        safe_strncat (buf, len, tmp, safe_strlen (tmp));
+        str_ncat (buf, len, tmp, str_len (tmp));
         break;
       case 'X':
         snprintf (tmp, sizeof (tmp), "%x", (unsigned int) now);
-        safe_strncat (buf, len, tmp, safe_strlen (tmp));
+        str_ncat (buf, len, tmp, str_len (tmp));
         break;
       case 'Y':
         snprintf (tmp, sizeof (tmp), "%04d", tm->tm_year + 1900);       /* this will break in the year 10000 ;-) */
-        safe_strncat (buf, len, tmp, 4);
+        str_ncat (buf, len, tmp, 4);
         break;
       case '%':
-        safe_strncat (buf, len, "%", 1);
+        str_ncat (buf, len, "%", 1);
         break;
       default:
-        safe_strncat (buf, len, ".", 1);        /* invalid formats are replaced by '.' */
+        str_ncat (buf, len, ".", 1);        /* invalid formats are replaced by '.' */
       }                         /* switch */
       ++fmt;
     }
@@ -1830,7 +1763,7 @@ static void mutt_gen_localpart (char *buf, unsigned int len, char *fmt)
       char c;
 
       c = mutt_normalized_char (*fmt);  /* @todo: filter out invalid characters */
-      safe_strncat (buf, len, &c, 1);
+      str_ncat (buf, len, &c, 1);
     }
   }
 }
@@ -1840,21 +1773,17 @@ char *mutt_gen_msgid (void)
   char buf[SHORT_STRING];
   char localpart[SHORT_STRING];
   unsigned int localpart_length;
-  time_t now;
-  struct tm *tm;
   const char *fqdn;
 
-  now = time (NULL);
-  tm = gmtime (&now);
   if (!(fqdn = mutt_fqdn (0)))
     fqdn = NONULL (Hostname);
 
-  localpart_length = sizeof (buf) - safe_strlen (fqdn) - 4;  /* the 4 characters are '<', '@', '>' and '\0' */
+  localpart_length = sizeof (buf) - str_len (fqdn) - 4;  /* the 4 characters are '<', '@', '>' and '\0' */
 
   mutt_gen_localpart (localpart, localpart_length, MsgIdFormat);
 
   snprintf (buf, sizeof (buf), "<%s@%s>", localpart, fqdn);
-  return (safe_strdup (buf));
+  return (str_dup (buf));
 }
 
 static RETSIGTYPE alarm_handler (int sig)
@@ -1887,7 +1816,7 @@ send_msg (const char *path, char **args, const char *msg, char **tempfile)
     char tmp[_POSIX_PATH_MAX];
 
     mutt_mktemp (tmp);
-    *tempfile = safe_strdup (tmp);
+    *tempfile = str_dup (tmp);
   }
 
   if ((pid = fork ()) == 0) {
@@ -1944,7 +1873,7 @@ send_msg (const char *path, char **args, const char *msg, char **tempfile)
     }
     else if (pid == -1) {
       unlink (msg);
-      FREE (tempfile);
+      mem_free (tempfile);
       _exit (S_ERR);
     }
 
@@ -1972,14 +1901,14 @@ send_msg (const char *path, char **args, const char *msg, char **tempfile)
       st = WIFEXITED (st) ? WEXITSTATUS (st) : S_ERR;
       if (SendmailWait && st == (0xff & EX_OK)) {
         unlink (*tempfile);     /* no longer needed */
-        FREE (tempfile);
+        mem_free (tempfile);
       }
     }
     else {
       st = (SendmailWait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR;
       if (SendmailWait > 0) {
         unlink (*tempfile);
-        FREE (tempfile);
+        mem_free (tempfile);
       }
     }
 
@@ -1990,7 +1919,7 @@ send_msg (const char *path, char **args, const char *msg, char **tempfile)
     if (kill (ppid, 0) == -1 && errno == ESRCH) {
       /* the parent is already dead */
       unlink (*tempfile);
-      FREE (tempfile);
+      mem_free (tempfile);
     }
 
     _exit (st);
@@ -2015,7 +1944,7 @@ static char **add_args (char **args, size_t * argslen, size_t * argsmax,
     /* weed out group mailboxes, since those are for display only */
     if (addr->mailbox && !addr->group) {
       if (*argslen == *argsmax)
-        safe_realloc (&args, (*argsmax += 5) * sizeof (char *));
+        mem_realloc (&args, (*argsmax += 5) * sizeof (char *));
       args[(*argslen)++] = addr->mailbox;
     }
   }
@@ -2026,24 +1955,11 @@ static char **add_option (char **args, size_t * argslen, size_t * argsmax,
                           char *s)
 {
   if (*argslen == *argsmax)
-    safe_realloc (&args, (*argsmax += 5) * sizeof (char *));
+    mem_realloc (&args, (*argsmax += 5) * sizeof (char *));
   args[(*argslen)++] = s;
   return (args);
 }
 
-static const char *strsysexit (int e)
-{
-  int i;
-
-  for (i = 0; sysexits_h[i].str; i++) {
-    if (e == sysexits_h[i].v)
-      break;
-  }
-
-  return sysexits_h[i].str;
-}
-
-
 static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
                                  ADDRESS * to, ADDRESS * cc, ADDRESS * bcc,     /* recips */
                                  const char *msg,       /* file containing message */
@@ -2066,22 +1982,22 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
       return i;
     }
 
-    s = safe_strdup (cmd);
+    s = str_dup (cmd);
   }
   else
 #endif
-    s = safe_strdup (Sendmail);
+    s = str_dup (Sendmail);
 
   ps = s;
   i = 0;
   while ((ps = strtok (ps, " "))) {
     if (argslen == argsmax)
-      safe_realloc (&args, sizeof (char *) * (argsmax += 5));
+      mem_realloc (&args, sizeof (char *) * (argsmax += 5));
 
     if (i)
       args[argslen++] = ps;
     else {
-      path = safe_strdup (ps);
+      path = str_dup (ps);
       ps = strrchr (ps, '/');
       if (ps)
         ps++;
@@ -2120,15 +2036,15 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
 #endif
 
   if (argslen == argsmax)
-    safe_realloc (&args, sizeof (char *) * (++argsmax));
+    mem_realloc (&args, sizeof (char *) * (++argsmax));
 
   args[argslen++] = NULL;
 
   if ((i = send_msg (path, args, msg, &childout)) != (EX_OK & 0xff)) {
     if (i != S_BKG) {
-      const char *e = strsysexit (i);
+      const char *e = mutt_strsysexit (i);
 
-      e = strsysexit (i);
+      e = mutt_strsysexit (i);
       mutt_error (_("Error sending message, child exited %d (%s)."), i,
                   NONULL (e));
       if (childout) {
@@ -2143,10 +2059,10 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
   else
     unlink (childout);
 
-  FREE (&childout);
-  FREE (&path);
-  FREE (&s);
-  FREE (&args);
+  mem_free (&childout);
+  mem_free (&path);
+  mem_free (&s);
+  mem_free (&args);
 
   if (i == (EX_OK & 0xff))
     i = 0;
@@ -2164,7 +2080,7 @@ int mutt_invoke_mta (ADDRESS * from,    /* the sender */
 {                               /* message contains 8bit chars */
 #ifdef USE_LIBESMTP
   if (SmtpHost)
-    return mutt_invoke_libesmtp (from, to, cc, bcc, msg, eightbit);
+    return mutt_libesmtp_invoke (from, to, cc, bcc, msg, eightbit);
 #endif
 
   return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
@@ -2174,9 +2090,9 @@ int mutt_invoke_mta (ADDRESS * from,    /* the sender */
    string. */
 char *mutt_append_string (char *a, const char *b)
 {
-  size_t la = safe_strlen (a);
+  size_t la = str_len (a);
 
-  safe_realloc (&a, la + safe_strlen (b) + 1);
+  mem_realloc (&a, la + str_len (b) + 1);
   strcpy (a + la, b);           /* __STRCPY_CHECKED__ */
   return (a);
 }
@@ -2204,14 +2120,14 @@ char *mutt_quote_string (const char *s)
   char *r, *pr;
   size_t rlen;
 
-  rlen = safe_strlen (s) + 3;
-  pr = r = (char *) safe_malloc (rlen);
+  rlen = str_len (s) + 3;
+  pr = r = (char *) mem_malloc (rlen);
   *pr++ = '"';
   while (*s) {
     if (INVALID_CHAR (*s)) {
       size_t o = pr - r;
 
-      safe_realloc (&r, ++rlen);
+      mem_realloc (&r, ++rlen);
       pr = r + o;
       *pr++ = '\\';
     }
@@ -2241,12 +2157,12 @@ void mutt_prepare_envelope (ENVELOPE * env, int final)
       rfc822_cat (buffer, sizeof (buffer), "undisclosed-recipients",
                   RFC822Specials);
 
-      env->to->mailbox = safe_strdup (buffer);
+      env->to->mailbox = str_dup (buffer);
     }
 
     mutt_set_followup_to (env);
 
-    if (!env->message_id)
+    if (!env->message_id && MsgIdFormat && *MsgIdFormat)
       env->message_id = mutt_gen_msgid ();
   }
 
@@ -2321,7 +2237,8 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, ADDRESS * to,
     fseek (fp, h->offset, 0);
     fprintf (f, "Resent-From: %s", resent_from);
     fprintf (f, "\nResent-%s", mutt_make_date (date, sizeof (date)));
-    fprintf (f, "Resent-Message-ID: %s\n", mutt_gen_msgid ());
+    if (MsgIdFormat && *MsgIdFormat)
+      fprintf (f, "Resent-Message-ID: %s\n", mutt_gen_msgid ());
     fputs ("Resent-To: ", f);
     mutt_write_address_list (to, f, 11, 0);
     mutt_copy_header (fp, h, f, ch_flags, NULL);