X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=1e8ffe7f6f55a57af92bae0592bf473d9bd9a335;hp=cedcd9ea17bcc2ea893074024c0bfea05fde8dd8;hb=08b24cfbdc0c35af65891f5b2478dc0ee33feb7e;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/sendlib.c b/sendlib.c index cedcd9e..1e8ffe7 100644 --- a/sendlib.c +++ b/sendlib.c @@ -1,19 +1,10 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-2002 Michael R. Elkins - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ #define _SENDLIB_C 1 @@ -23,18 +14,25 @@ #endif #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/mem.h" +#include "lib/str.h" +#include "lib/intl.h" +#include "lib/debug.h" + #include #include #include @@ -71,77 +69,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"; @@ -192,11 +119,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; } @@ -367,7 +294,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; @@ -378,7 +305,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); @@ -391,9 +318,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 = 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); @@ -430,10 +357,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); } } @@ -462,9 +389,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); @@ -486,15 +411,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; } @@ -693,10 +616,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")) @@ -786,10 +709,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 @@ -828,11 +751,11 @@ 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; - tcode[i] = mutt_substrdup (c, c1); + tcode[i] = str_substrdup (c, c1); } ret = (size_t) (-1); @@ -841,7 +764,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); @@ -851,7 +774,7 @@ static size_t convert_file_from_to (FILE * file, tcode[cn] = 0; break; } - FREE (&fcode); + mem_free (&fcode); } } else { @@ -866,9 +789,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; } @@ -882,7 +805,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]; @@ -904,12 +827,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 = mem_calloc (1, sizeof (CONTENT)); memset (&state, 0, sizeof (state)); if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) { @@ -924,7 +846,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; } @@ -968,7 +890,7 @@ 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++) { /* @@ -980,16 +902,13 @@ 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; 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 */ } @@ -1011,9 +930,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 - @@ -1031,7 +950,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)); @@ -1049,8 +968,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); @@ -1099,7 +1018,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); @@ -1112,7 +1031,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"); @@ -1153,7 +1072,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"); @@ -1263,7 +1182,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; } @@ -1290,8 +1209,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; @@ -1357,7 +1276,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. @@ -1369,8 +1288,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 @@ -1392,11 +1311,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"); } } @@ -1424,7 +1343,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; @@ -1478,7 +1397,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... */ @@ -1517,7 +1436,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; } @@ -1526,7 +1445,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 @@ -1552,6 +1471,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)) @@ -1559,6 +1479,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 */ @@ -1576,7 +1498,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); @@ -1586,7 +1509,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)) { @@ -1598,28 +1522,30 @@ 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)) + 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)) + 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)) + 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) + else if (mode == 1 && EDIT_HEADER("Subject:")) fputs ("Subject: \n", fp); /* save message id if the user has set it */ @@ -1630,7 +1556,7 @@ 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) + else if (mode > 0 && EDIT_HEADER("Reply-To:")) fputs ("Reply-To: \n", fp); if (env->mail_followup_to) @@ -1660,6 +1586,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, ':'))) { @@ -1696,9 +1624,11 @@ 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); } + list_del (&hdrs, (list_del_t*) _mem_free); + return (ferror (fp) == 0 ? 0 : -1); } @@ -1715,18 +1645,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, - mutt_strlen (h->data) + 2 + mutt_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); } } @@ -1780,62 +1710,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; } @@ -1843,7 +1773,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); } } } @@ -1853,21 +1783,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) @@ -1900,7 +1826,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) { @@ -1957,7 +1883,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); } @@ -1985,14 +1911,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); } } @@ -2003,7 +1929,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); @@ -2028,7 +1954,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; } } @@ -2039,24 +1965,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 */ @@ -2079,22 +1992,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++; @@ -2133,15 +2046,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) { @@ -2156,10 +2069,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; @@ -2176,8 +2089,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); @@ -2187,9 +2103,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); + mem_realloc (&a, la + str_len (b) + 1); strcpy (a + la, b); /* __STRCPY_CHECKED__ */ return (a); } @@ -2217,14 +2133,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 = (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++ = '\\'; } @@ -2254,12 +2170,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 (); } @@ -2334,7 +2250,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); @@ -2403,8 +2320,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; @@ -2449,10 +2365,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); } @@ -2567,8 +2480,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, 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? */