X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=f17b0d55e4143dce1cfa628a22ea88f52907b177;hp=4c410cf56bae84c0e22defbea5c82cdf9cf1eabb;hb=9e6ab0152703ad301042ce8810859f41fbee405a;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/sendlib.c b/sendlib.c
index 4c410cf..f17b0d5 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -13,19 +13,27 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
+#include "recvattach.h"
 #include "mutt_curses.h"
 #include "rfc2047.h"
 #include "rfc2231.h"
 #include "mx.h"
 #include "mime.h"
-#include "mailbox.h"
 #include "copy.h"
 #include "pager.h"
 #include "charset.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
+#include "lib/str.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -62,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";
@@ -183,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 && !mutt_strncmp ("From", line, 4)) {
+    if (linelen == 4 && !str_ncmp ("From", line, 4)) {
       strfcpy (line, "=46rom", sizeof (line));
       linelen = 6;
     }
-    else if (linelen == 4 && !mutt_strncmp ("from", line, 4)) {
+    else if (linelen == 4 && !str_ncmp ("from", line, 4)) {
       strfcpy (line, "=66rom", sizeof (line));
       linelen = 6;
     }
@@ -358,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 + mutt_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;
@@ -369,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);
 
@@ -382,9 +319,9 @@ int mutt_write_mime_header (BODY * a, FILE * f)
           && !strcmp (buffer, tmp))
         snprintf (buffer, sizeof (buffer), "\"%s\"", tmp);
 
-      FREE (&tmp);
+      p_delete(&tmp);
 
-      tmplen = mutt_strlen (buffer) + mutt_strlen (p->attribute) + 1;
+      tmplen = str_len (buffer) + str_len (p->attribute) + 1;
 
       if (len + tmplen + 2 > 76) {
         fputs ("\n\t", f);
@@ -421,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);
+      p_delete(&tmp);
       fprintf (f, "; filename%s=%s", encode ? "*" : "", buffer);
     }
   }
@@ -453,9 +390,7 @@ int mutt_write_mime_body (BODY * a, FILE * f)
   if (a->type == TYPEMULTIPART) {
     /* First, find the boundary to use */
     if (!(p = mutt_get_parameter ("boundary", a->parameter))) {
-      dprint (1,
-              (debugfile,
-               "mutt_write_mime_body(): no boundary parameter found!\n"));
+      debug_print (1, ("no boundary parameter found!\n"));
       mutt_error _("No boundary parameter found! [report this error]");
 
       return (-1);
@@ -477,15 +412,13 @@ 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
-      && mutt_strcmp (a->subtype, "pgp-encrypted") == 0) {
+      && str_cmp (a->subtype, "pgp-encrypted") == 0) {
     fputs ("Version: 1\n", f);
     return 0;
   }
 
   if ((fpin = fopen (a->filename, "r")) == NULL) {
-    dprint (1,
-            (debugfile, "write_mime_body: %s no longer exists!\n",
-             a->filename));
+    debug_print (1, ("%s no longer exists!\n", a->filename));
     mutt_error (_("%s no longer exists!"), a->filename);
     return -1;
   }
@@ -672,7 +605,7 @@ static size_t convert_file_to (FILE * file, const char *fromcode,
 #ifdef HAVE_ICONV
   iconv_t cd1, *cd;
   char bufi[256], bufu[512], bufo[4 * sizeof (bufi)];
-  ICONV_CONST char *ib, *ub;
+  const char *ib, *ub;
   char *ob;
   size_t ibl, obl, ubl, ubl1, n, ret;
   int i;
@@ -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 = p_new(iconv_t, ncodes);
+  score = p_new(size_t, ncodes);
+  states = p_new(CONTENT_STATE, ncodes);
+  infos = p_new(CONTENT, ncodes);
 
   for (i = 0; i < ncodes; i++)
     if (ascii_strcasecmp (tocodes[i], "UTF-8"))
@@ -707,7 +640,7 @@ static size_t convert_file_to (FILE * file, const char *fromcode,
     /* Convert to UTF-8 */
     ib = bufi;
     ob = bufu, obl = sizeof (bufu);
-    n = iconv (cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
+    n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
     assert (n == (size_t) (-1) || !n || ICONV_NONTRANS);
     if (n == (size_t) (-1) &&
         ((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
@@ -723,7 +656,7 @@ static size_t convert_file_to (FILE * file, const char *fromcode,
       if (cd[i] != (iconv_t) (-1) && score[i] != (size_t) (-1)) {
         ub = bufu, ubl = ubl1;
         ob = bufo, obl = sizeof (bufo);
-        n = iconv (cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl);
+        n = my_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl);
         if (n == (size_t) (-1)) {
           assert (errno == E2BIG ||
                   (BUGGY_ICONV && (errno == EILSEQ || errno == ENOENT)));
@@ -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);
+  p_delete(&cd);
+  p_delete(&infos);
+  p_delete(&score);
+  p_delete(&states);
 
   return ret;
 #else
@@ -819,11 +752,11 @@ static size_t convert_file_from_to (FILE * file,
   }
 
   /* Copy them */
-  tcode = safe_malloc (ncodes * sizeof (char *));
+  tcode = p_new(char *, ncodes);
   for (c = tocodes, i = 0; c; c = c1 ? c1 + 1 : 0, i++) {
     if ((c1 = strchr (c, ':')) == c)
       continue;
-    tcode[i] = mutt_substrdup (c, c1);
+    tcode[i] = str_substrdup (c, c1);
   }
 
   ret = (size_t) (-1);
@@ -832,7 +765,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 = mutt_substrdup (c, c1);
+      fcode = str_substrdup (c, c1);
 
       ret = convert_file_to (file, fcode, ncodes, (const char **) tcode,
                              &cn, info);
@@ -842,7 +775,7 @@ static size_t convert_file_from_to (FILE * file,
         tcode[cn] = 0;
         break;
       }
-      FREE (&fcode);
+      p_delete(&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]);
+    p_delete(&tcode[i]);
 
-  FREE (tcode);
+  p_delete(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];
@@ -895,12 +828,11 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
   }
 
   if ((fp = fopen (fname, "r")) == NULL) {
-    dprint (1, (debugfile, "mutt_get_content_info: %s: %s (errno %d).\n",
-                fname, strerror (errno), errno));
+    debug_print (1, ("%s: %s (errno %d).\n", fname, strerror (errno), errno));
     return (NULL);
   }
 
-  info = safe_calloc (1, sizeof (CONTENT));
+  info = p_new(CONTENT, 1);
   memset (&state, 0, sizeof (state));
 
   if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) {
@@ -915,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);
+      p_delete(&tocode);
       safe_fclose (&fp);
       return info;
     }
@@ -959,9 +891,9 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
   type = TYPEOTHER;
   cur_sze = 0;
 
-  szf = mutt_strlen (path);
+  szf = str_len (path);
 
-  for (count = 0; count < 3; count++) {
+  for (count = 0; count < 4; count++) {
     /*
      * can't use strtok() because we use it in an inner loop below, so use
      * a switch statement here instead.
@@ -971,16 +903,16 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
       snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL (Homedir));
       break;
     case 1:
-      strfcpy (buf, SYSCONFDIR "/mime.types", sizeof (buf));
+      strfcpy (buf, SYSCONFDIR "/muttng-mime.types", sizeof (buf));
       break;
     case 2:
       strfcpy (buf, PKGDATADIR "/mime.types", sizeof (buf));
       break;
+    case 3:
+      strfcpy (buf, SYSCONFDIR "/mime.types", sizeof (buf));
+      break;
     default:
-      dprint (1,
-              (debugfile,
-               "mutt_lookup_mime_type: Internal error, count = %d.\n",
-               count));
+      debug_print (1, ("Internal error, count = %d.\n", count));
       goto bye;                 /* shouldn't happen */
     }
 
@@ -1002,9 +934,9 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
 
         /* cycle through the file extensions */
         while ((p = strtok (p, " \t\n"))) {
-          sze = mutt_strlen (p);
+          sze = str_len (p);
           if ((sze > cur_sze) && (szf >= sze) &&
-              (mutt_strcasecmp (path + szf - sze, p) == 0
+              (str_casecmp (path + szf - sze, p) == 0
                || ascii_strcasecmp (path + szf - sze, p) == 0) && (szf == sze
                                                                    || path[szf
                                                                            -
@@ -1022,7 +954,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
 
             for (q = p; *q && !ISSPACE (*q); q++);
 
-            mutt_substrcpy (subtype, p, q, sizeof (subtype));
+            str_substrcpy (subtype, p, q, sizeof (subtype));
 
             if ((type = mutt_check_mime_type (ct)) == TYPEOTHER)
               strfcpy (xtype, ct, sizeof (xtype));
@@ -1040,8 +972,8 @@ bye:
 
   if (type != TYPEOTHER || *xtype != '\0') {
     att->type = type;
-    mutt_str_replace (&att->subtype, subtype);
-    mutt_str_replace (&att->xtype, xtype);
+    str_replace (&att->subtype, subtype);
+    str_replace (&att->xtype, xtype);
   }
 
   return (type);
@@ -1076,7 +1008,7 @@ void mutt_message_to_7bit (BODY * a, FILE * fp)
     goto cleanup;
   }
 
-  fseek (fpin, a->offset, 0);
+  fseeko (fpin, a->offset, 0);
   a->parts = mutt_parse_messageRFC822 (fpin, a);
 
   transform_to_7bit (a->parts, fpin);
@@ -1084,13 +1016,13 @@ void mutt_message_to_7bit (BODY * a, FILE * fp)
   mutt_copy_hdr (fpin, fpout, a->offset, a->offset + a->length,
                  CH_MIME | CH_NONEWLINE | CH_XMIT, NULL);
 
-  fputs ("Mime-Version: 1.0\n", fpout);
+  fputs ("MIME-Version: 1.0\n", fpout);
   mutt_write_mime_header (a->parts, fpout);
   fputc ('\n', fpout);
   mutt_write_mime_body (a->parts, fpout);
 
 cleanup:
-  FREE (&line);
+  p_delete(&line);
 
   if (fpin && !fp)
     fclose (fpin);
@@ -1103,7 +1035,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");
@@ -1144,7 +1076,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");
@@ -1254,7 +1186,7 @@ void mutt_update_encoding (BODY * a)
   mutt_set_encoding (a, info);
   mutt_stamp_attachment (a);
 
-  FREE (&a->content);
+  p_delete(&a->content);
   a->content = info;
 
 }
@@ -1281,8 +1213,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;
@@ -1348,7 +1280,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.
@@ -1360,8 +1292,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
@@ -1383,11 +1315,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");
     }
   }
 
@@ -1415,7 +1347,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;
@@ -1469,7 +1401,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 = mutt_strlen (buf);
+    len = str_len (buf);
     if (count && linelen + len > 74) {
       fputs ("\n\t", fp);
       linelen = len + 8;        /* tab is usually about 8 spaces... */
@@ -1508,7 +1440,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 *));
+      p_realloc(&ref, refmax += REF_INC);
     ref[refcnt++] = r;
   }
 
@@ -1517,7 +1449,7 @@ void mutt_write_references (LIST * r, FILE * f)
     fputs (ref[refcnt]->data, f);
   }
 
-  FREE (&ref);
+  p_delete(&ref);
 }
 
 /* Note: all RFC2047 encoding should be done outside of this routine, except
@@ -1543,6 +1475,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
   char *p;
   LIST *tmp = env->userhdrs;
   int has_agent = 0;            /* user defined user-agent header field exists */
+  list2_t* hdrs = list_from_str (EditorHeaders, " ");
 
 #ifdef USE_NNTP
   if (!option (OPTNEWSSEND))
@@ -1550,6 +1483,8 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
     if (mode == 0 && !privacy)
       fputs (mutt_make_date (buffer, sizeof (buffer)), fp);
 
+#define EDIT_HEADER(x) (mode != 1 || option(OPTXMAILTO) || (mode == 1 && list_lookup(hdrs,(list_lookup_t*) ascii_strcasecmp,x) >= 0))
+
   /* OPTUSEFROM is not consulted here so that we can still write a From:
    * field if the user sets it with the `my_hdr' command
    */
@@ -1567,7 +1502,8 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
 #ifdef USE_NNTP
     if (!option (OPTNEWSSEND))
 #endif
-      fputs ("To: \n", fp);
+      if (EDIT_HEADER("To:"))
+        fputs ("To:\n", fp);
 
   if (env->cc) {
     fputs ("Cc: ", fp);
@@ -1577,7 +1513,8 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
 #ifdef USE_NNTP
     if (!option (OPTNEWSSEND))
 #endif
-      fputs ("Cc: \n", fp);
+      if (EDIT_HEADER("Cc:"))
+        fputs ("Cc:\n", fp);
 
   if (env->bcc) {
     if (mode != 0 || option (OPTWRITEBCC)) {
@@ -1589,29 +1526,31 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
 #ifdef USE_NNTP
     if (!option (OPTNEWSSEND))
 #endif
-      fputs ("Bcc: \n", fp);
+      if (EDIT_HEADER("Bcc:"))
+        fputs ("Bcc:\n", fp);
 
 #ifdef USE_NNTP
   if (env->newsgroups)
     fprintf (fp, "Newsgroups: %s\n", env->newsgroups);
-  else if (mode == 1 && option (OPTNEWSSEND))
-    fputs ("Newsgroups: \n", fp);
+  else if (mode == 1 && option (OPTNEWSSEND) && EDIT_HEADER("Newsgroups:"))
+    fputs ("Newsgroups:\n", fp);
 
   if (env->followup_to)
     fprintf (fp, "Followup-To: %s\n", env->followup_to);
-  else if (mode == 1 && option (OPTNEWSSEND))
-    fputs ("Followup-To: \n", fp);
+  else if (mode == 1 && option (OPTNEWSSEND) && EDIT_HEADER("Followup-To:"))
+    fputs ("Followup-To:\n", fp);
 
   if (env->x_comment_to)
     fprintf (fp, "X-Comment-To: %s\n", env->x_comment_to);
-  else if (mode == 1 && option (OPTNEWSSEND) && option (OPTXCOMMENTTO))
-    fputs ("X-Comment-To: \n", fp);
+  else if (mode == 1 && option (OPTNEWSSEND) && option (OPTXCOMMENTTO) &&
+           EDIT_HEADER("X-Comment-To:"))
+    fputs ("X-Comment-To:\n", fp);
 #endif
 
   if (env->subject)
     fprintf (fp, "Subject: %s\n", env->subject);
-  else if (mode == 1)
-    fputs ("Subject: \n", fp);
+  else if (mode == 1 && EDIT_HEADER("Subject:"))
+    fputs ("Subject:\n", fp);
 
   /* save message id if the user has set it */
   if (env->message_id && !privacy)
@@ -1621,8 +1560,8 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
     fputs ("Reply-To: ", fp);
     mutt_write_address_list (env->reply_to, fp, 10, 0);
   }
-  else if (mode > 0)
-    fputs ("Reply-To: \n", fp);
+  else if (mode > 0 && EDIT_HEADER("Reply-To:"))
+    fputs ("Reply-To:\n", fp);
 
   if (env->mail_followup_to)
 #ifdef USE_NNTP
@@ -1641,7 +1580,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
     }
 
     /* Add the MIME headers */
-    fputs ("Mime-Version: 1.0\n", fp);
+    fputs ("MIME-Version: 1.0\n", fp);
     mutt_write_mime_header (attach, fp);
   }
 
@@ -1651,6 +1590,8 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
     fputc ('\n', fp);
   }
 
+#undef EDIT_HEADER
+
   /* Add any user defined headers */
   for (; tmp; tmp = tmp->next) {
     if ((p = strchr (tmp->data, ':'))) {
@@ -1672,24 +1613,20 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
   }
 
   if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
-    struct utsname un;
-    char *os;
+    const char *os;
 
     if (OperatingSystem != NULL) {
       os = OperatingSystem;
-    }
-    else {
-      if (uname (&un) == -1) {
-        os = "UNIX";
-      }
-      else {
-        os = un.sysname;
-      }
+    } else {
+      struct utsname un;
+      os = (uname(&un) == -1) ? "UNIX" : un.sysname;
     }
     /* 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);
   }
 
+  list_del (&hdrs, (list_del_t*)xmemfree);
+
   return (ferror (fp) == 0 ? 0 : -1);
 }
 
@@ -1706,18 +1643,17 @@ 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,
-                  mutt_strlen (h->data) + 2 + mutt_strlen (tmp) + 1);
+    p_realloc(&h->data, str_len(h->data) + 2 + str_len(tmp) + 1);
 
     sprintf (h->data + i, ": %s", NONULL (tmp));        /* __SPRINTF_CHECKED__ */
 
-    FREE (&tmp);
+    p_delete(&tmp);
   }
 }
 
@@ -1771,62 +1707,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, 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, 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, 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, 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, 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, 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;
     }
@@ -1834,7 +1770,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);
     }
   }
 }
@@ -1844,21 +1780,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) - 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)
@@ -1874,7 +1806,7 @@ static RETSIGTYPE alarm_handler (int sig)
    			to the temporary file containing the stdout of the
 			child process */
 static int
-send_msg (const char *path, char **args, const char *msg, char **tempfile)
+send_msg(const char *path, const char **args, const char *msg, char **tempfile)
 {
   sigset_t set;
   int fd, st;
@@ -1891,7 +1823,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) {
@@ -1948,7 +1880,7 @@ send_msg (const char *path, char **args, const char *msg, char **tempfile)
     }
     else if (pid == -1) {
       unlink (msg);
-      FREE (tempfile);
+      p_delete(tempfile);
       _exit (S_ERR);
     }
 
@@ -1976,14 +1908,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);
+        p_delete(tempfile);
       }
     }
     else {
       st = (SendmailWait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR;
       if (SendmailWait > 0) {
         unlink (*tempfile);
-        FREE (tempfile);
+        p_delete(tempfile);
       }
     }
 
@@ -1994,7 +1926,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);
+      p_delete(tempfile);
     }
 
     _exit (st);
@@ -2012,49 +1944,37 @@ send_msg (const char *path, char **args, const char *msg, char **tempfile)
   return (st);
 }
 
-static char **add_args (char **args, size_t * argslen, size_t * argsmax,
-                        ADDRESS * addr)
+static const char **
+add_args(const char **args, size_t *argslen, size_t *argsmax, ADDRESS * addr)
 {
   for (; addr; addr = addr->next) {
     /* 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 *));
+        p_realloc(&args, *argsmax += 5);
       args[(*argslen)++] = addr->mailbox;
     }
   }
   return (args);
 }
 
-static char **add_option (char **args, size_t * argslen, size_t * argsmax,
-                          char *s)
-{
-  if (*argslen == *argsmax)
-    safe_realloc (&args, (*argsmax += 5) * sizeof (char *));
-  args[(*argslen)++] = s;
-  return (args);
-}
-
-static const char *strsysexit (int e)
+static const char **
+add_option(const char **args, size_t *argslen, size_t *argsmax, const char *s)
 {
-  int i;
-
-  for (i = 0; sysexits_h[i].str; i++) {
-    if (e == sysexits_h[i].v)
-      break;
-  }
-
-  return sysexits_h[i].str;
+    if (*argslen == *argsmax) {
+        p_realloc(&args, *argsmax += 5);
+    }
+    args[(*argslen)++] = s;
+    return (args);
 }
 
-
 static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
                                  ADDRESS * to, ADDRESS * cc, ADDRESS * bcc,     /* recips */
                                  const char *msg,       /* file containing message */
                                  int eightbit)
 {                               /* message contains 8bit chars */
   char *ps = NULL, *path = NULL, *s = NULL, *childout = NULL;
-  char **args = NULL;
+  const char **args = NULL;
   size_t argslen = 0, argsmax = 0;
   int i;
 
@@ -2070,22 +1990,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));
+      p_realloc(&args, argsmax += 5);
 
     if (i)
       args[argslen++] = ps;
     else {
-      path = safe_strdup (ps);
+      path = str_dup (ps);
       ps = strrchr (ps, '/');
       if (ps)
         ps++;
@@ -2101,11 +2021,18 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
   if (!option (OPTNEWSSEND)) {
 #endif
     if (eightbit && option (OPTUSE8BITMIME))
-      args = add_option (args, &argslen, &argsmax, "-B8BITMIME");
-
-    if (option (OPTENVFROM) && from && !from->next) {
-      args = add_option (args, &argslen, &argsmax, "-f");
-      args = add_args (args, &argslen, &argsmax, from);
+      args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
+
+    if (option (OPTENVFROM)) {
+      ADDRESS *f = NULL;
+      if (EnvFrom)
+        f = EnvFrom;
+      else if (from && !from->next)
+        f = from;
+      if (f) {
+        args = add_option (args, &argslen, &argsmax, "-f");
+        args = add_args (args, &argslen, &argsmax, f);
+      }
     }
     if (DsnNotify) {
       args = add_option (args, &argslen, &argsmax, "-N");
@@ -2124,15 +2051,15 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
 #endif
 
   if (argslen == argsmax)
-    safe_realloc (&args, sizeof (char *) * (++argsmax));
+    p_realloc(&args, ++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) {
@@ -2147,10 +2074,10 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
   else
     unlink (childout);
 
-  FREE (&childout);
-  FREE (&path);
-  FREE (&s);
-  FREE (&args);
+  p_delete(&childout);
+  p_delete(&path);
+  p_delete(&s);
+  p_delete(&args);
 
   if (i == (EX_OK & 0xff))
     i = 0;
@@ -2167,8 +2094,11 @@ int mutt_invoke_mta (ADDRESS * from,    /* the sender */
                      int eightbit)
 {                               /* message contains 8bit chars */
 #ifdef USE_LIBESMTP
-  if (SmtpHost)
-    return mutt_invoke_libesmtp (from, to, cc, bcc, msg, eightbit);
+#ifdef USE_NNTP
+  if (!option (OPTNEWSSEND))
+#endif
+    if (SmtpHost)
+      return mutt_libesmtp_invoke (from, to, cc, bcc, msg, eightbit);
 #endif
 
   return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
@@ -2178,9 +2108,9 @@ int mutt_invoke_mta (ADDRESS * from,    /* the sender */
    string. */
 char *mutt_append_string (char *a, const char *b)
 {
-  size_t la = mutt_strlen (a);
+  size_t la = str_len (a);
 
-  safe_realloc (&a, la + mutt_strlen (b) + 1);
+  p_realloc(&a, la + str_len(b) + 1);
   strcpy (a + la, b);           /* __STRCPY_CHECKED__ */
   return (a);
 }
@@ -2208,14 +2138,14 @@ char *mutt_quote_string (const char *s)
   char *r, *pr;
   size_t rlen;
 
-  rlen = mutt_strlen (s) + 3;
-  pr = r = (char *) safe_malloc (rlen);
+  rlen = str_len (s) + 3;
+  pr = r = p_new(char, rlen);
   *pr++ = '"';
   while (*s) {
     if (INVALID_CHAR (*s)) {
       size_t o = pr - r;
 
-      safe_realloc (&r, ++rlen);
+      p_realloc(&r, ++rlen);
       pr = r + o;
       *pr++ = '\\';
     }
@@ -2245,12 +2175,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 ();
   }
 
@@ -2322,10 +2252,11 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, ADDRESS * to,
     if (!option (OPTBOUNCEDELIVERED))
       ch_flags |= CH_WEED_DELIVERED;
 
-    fseek (fp, h->offset, 0);
+    fseeko (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);
@@ -2394,8 +2325,7 @@ ADDRESS *mutt_remove_duplicates (ADDRESS * addr)
     }
 
     if (dup) {
-      dprint (2, (debugfile, "mutt_remove_duplicates: Removing %s\n",
-                  addr->mailbox));
+      debug_print (2, ("Removing %s\n", addr->mailbox));
 
       *last = addr->next;
 
@@ -2440,10 +2370,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
     set_noconv_flags (hdr->content, 1);
 
   if (mx_open_mailbox (path, M_APPEND | M_QUIET, &f) == NULL) {
-    dprint (1,
-            (debugfile,
-             "mutt_write_fcc(): unable to open mailbox %s in append-mode, aborting.\n",
-             path));
+    debug_print (1, ("unable to open mailbox %s in append-mode, aborting.\n", path));
     return (-1);
   }
 
@@ -2550,16 +2477,15 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
      * this will happen, and it can cause problems parsing the mailbox   
      * later.
      */
-    fseek (tempfp, -1, 2);
+    fseeko (tempfp, -1, 2);
     if (fgetc (tempfp) != '\n') {
-      fseek (tempfp, 0, 2);
+      fseeko (tempfp, 0, 2);
       fputc ('\n', tempfp);
     }
 
     fflush (tempfp);
     if (ferror (tempfp)) {
-      dprint (1,
-              (debugfile, "mutt_write_fcc(): %s: write failed.\n", tempfile));
+      debug_print (1, ("%s: write failed.\n", tempfile));
       fclose (tempfp);
       unlink (tempfile);
       mx_commit_message (msg, &f);      /* XXX - really? */
@@ -2572,7 +2498,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
     rewind (tempfp);
     while (fgets (sasha, sizeof (sasha), tempfp) != NULL)
       lines++;
-    fprintf (msg->fp, "Content-Length: %ld\n", (long) ftell (tempfp));
+    fprintf (msg->fp, "Content-Length: %zd\n", ftello (tempfp));
     fprintf (msg->fp, "Lines: %d\n\n", lines);
 
     /* copy the body and clean up */