X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=9881bbe3aba50daeb1a5c08c18eb50dadc1ec88a;hp=1802e1da8b3b4f0c6f82c903312ca0c92df7410e;hb=e0571c496935f226abe4a22921b5b4e10d1481e8;hpb=b6980caf7b13994c57957872876cdecc21e54a82 diff --git a/sendlib.c b/sendlib.c index 1802e1d..9881bbe 100644 --- a/sendlib.c +++ b/sendlib.c @@ -10,31 +10,26 @@ #include #include -#include #include #include #include #include -#include +#include +#include #include -#include - #include "mutt.h" #include "handler.h" +#include "crypt.h" #include "recvattach.h" #include "copy.h" #include "pager.h" #include "charset.h" #include "mutt_idna.h" -#ifdef USE_LIBESMTP -# include "mutt_libesmtp.h" -#endif /* USE_LIBESMTP */ - #ifdef USE_NNTP -#include +#include "nntp.h" #endif #ifdef HAVE_SYSEXITS_H @@ -539,7 +534,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, int ncodes, const char **tocodes, int *tocode, CONTENT * info) { -#ifdef HAVE_ICONV iconv_t cd1, *cd; char bufi[256], bufu[512], bufo[4 * sizeof (bufi)]; const char *ib, *ub; @@ -647,9 +641,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, p_delete(&states); return ret; -#else - return -1; -#endif /* !HAVE_ICONV */ } /* @@ -767,10 +758,10 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) { const char *chs = parameter_getval(b->parameter, "charset"); - char *fchs = b->use_disp && !m_strisempty(MCharset.file_charset) - ? FileCharset : MCharset.charset; - if (MCharset.charset && (chs || MCharset.send_charset) && - convert_file_from_to (fp, fchs, chs ? chs : MCharset.send_charset, + char *fchs = b->use_disp && !m_strisempty(mod_cset.file_charset) + ? FileCharset : mod_cset.charset; + if (mod_cset.charset && (chs || mod_cset.send_charset) && + convert_file_from_to (fp, fchs, chs ? chs : mod_cset.send_charset, &fromcode, &tocode, info) != -1) { if (!chs) { charset_canonicalize (chsbuf, sizeof (chsbuf), tocode); @@ -793,8 +784,8 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) parameter_setval(&b->parameter, "charset", (!info->hibin ? "us-ascii" - : MCharset.charset && !charset_is_us_ascii(MCharset.charset) - ? MCharset.charset : "unknown-8bit")); + : mod_cset.charset && !charset_is_us_ascii(mod_cset.charset) + ? mod_cset.charset : "unknown-8bit")); return info; } @@ -830,7 +821,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path) */ switch (count) { case 0: - snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(MCore.homedir)); + snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(mod_core.homedir)); break; case 1: m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types"); @@ -926,7 +917,7 @@ void mutt_message_to_7bit (BODY * a, FILE * fp) a->length = sb.st_size; } - fpout = m_tempfile(temp, sizeof(temp), NONULL(MCore.tmpdir), NULL); + fpout = m_tempfile(temp, sizeof(temp), NONULL(mod_core.tmpdir), NULL); if (!fpout) { mutt_error(_("Could not create temporary file")); goto cleanup; @@ -991,7 +982,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin) a->noconv = 1; a->force_charset = 1; - s.fpout = m_tempfile(buff, sizeof(buff), NONULL(MCore.tmpdir), NULL); + s.fpout = m_tempfile(buff, sizeof(buff), NONULL(mod_core.tmpdir), NULL); if (!s.fpout) { mutt_error(_("Could not create temporary file")); return; @@ -1111,11 +1102,9 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg) if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) && (hdr->security & ENCRYPT)) { - if (!crypt_valid_passphrase (hdr->security)) - return (NULL); } - fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL); + fp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL); if (!fp) return NULL; @@ -1259,17 +1248,13 @@ BODY *mutt_remove_multipart (BODY * b) char *mutt_make_date (char *s, ssize_t len) { - time_t t = time (NULL); - struct tm *l = localtime (&t); - time_t tz = mutt_local_tz (t); - - tz /= 60; + time_t t = time(NULL); + const char *loc; - snprintf (s, len, "Date: %s, %d %s %d %02d:%02d:%02d %+03d%02d\n", - Weekdays[l->tm_wday], l->tm_mday, Months[l->tm_mon], - l->tm_year + 1900, l->tm_hour, l->tm_min, l->tm_sec, - (int) tz / 60, (int) abs (tz) % 60); - return (s); + loc = setlocale(LC_TIME, "C"); + strftime(s, len, "Date: %a, %d %b %Y %T %z\n", localtime(&t)); + setlocale(LC_TIME, loc); + return s; } /* wrapper around mutt_write_address() so we can handle very large @@ -1353,14 +1338,9 @@ static int edit_header(int mode, const char *s) * mode == 1 => "lite" mode (used for edit_hdrs) * mode == 0 => normal mode. write full header + MIME headers * mode == -1 => write just the envelope info (used for postponing messages) - * - * privacy != 0 => will omit any headers which may identify the user. - * Output generated is suitable for being sent through - * anonymous remailer chains. - * */ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, - int mode, int privacy) + int mode) { char buffer[LONG_STRING]; char *p; @@ -1370,13 +1350,13 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, #ifdef USE_NNTP if (!option (OPTNEWSSEND)) #endif - if (mode == 0 && !privacy) + if (mode == 0) fputs (mutt_make_date (buffer, sizeof (buffer)), fp); /* OPTUSEFROM is not consulted here so that we can still write a From: * field if the user sets it with the `my_hdr' command */ - if (env->from && !privacy) { + if (env->from) { buffer[0] = 0; rfc822_addrcat(buffer, sizeof(buffer), env->from, 0); fprintf (fp, "From: %s\n", buffer); @@ -1427,12 +1407,6 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, fprintf (fp, "Followup-To: %s\n", env->followup_to); else if (mode == 1 && option (OPTNEWSSEND) && edit_header(mode, "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) && - edit_header(mode, "X-Comment-To:")) - fputs ("X-Comment-To:\n", fp); #endif if (env->subject) @@ -1441,7 +1415,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, fputs ("Subject:\n", fp); /* save message id if the user has set it */ - if (env->message_id && !privacy) + if (env->message_id) fprintf (fp, "Message-ID: %s\n", env->message_id); if (env->reply_to) { @@ -1488,8 +1462,6 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, /* check to see if the user has overridden the user-agent field */ if (!ascii_strncasecmp ("user-agent", tmp->data, 10)) { has_agent = 1; - if (privacy) - continue; } fputs (tmp->data, fp); @@ -1497,17 +1469,13 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, } } - if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) { - const char *os; - - if (OperatingSystem != NULL) { - os = OperatingSystem; + if (mode == 0 && option (OPTXMAILER) && !has_agent) { + if (mod_core.operating_system) { + fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(), + mod_core.operating_system); } else { - struct utsname un; - os = (uname(&un) == -1) ? "UNIX" : un.sysname; + fprintf(fp, "User-Agent: %s\n", mutt_make_version()); } - /* Add a vanity header */ - fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version(), os); } return (ferror (fp) == 0 ? 0 : -1); @@ -1543,18 +1511,18 @@ const char *mutt_fqdn(short may_hide_host) { char *p = NULL, *q; - if (MCore.hostname && MCore.hostname[0] != '@') { - p = MCore.hostname; + if (mod_core.hostname && mod_core.hostname[0] != '@') { + p = mod_core.hostname; if (may_hide_host && option (OPTHIDDENHOST)) { - if ((p = strchr(MCore.hostname, '.'))) + if ((p = strchr(mod_core.hostname, '.'))) p++; /* sanity check: don't hide the host if the fqdn is something like detebe.org. */ if (!p || !(q = strchr(p, '.'))) - p = MCore.hostname; + p = mod_core.hostname; } } @@ -1657,14 +1625,14 @@ static char *mutt_gen_msgid (void) const char *fqdn; if (!(fqdn = mutt_fqdn(0))) - fqdn = NONULL(MCore.shorthost); + fqdn = NONULL(mod_core.shorthost); mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat); snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn); return m_strdup(buf); } -static RETSIGTYPE alarm_handler (int sig __attribute__ ((unused))) +static void alarm_handler (int sig __attribute__ ((unused))) { SigAlrm = 1; } @@ -1828,11 +1796,9 @@ add_option(const char **args, ssize_t *argslen, ssize_t *argsmax, const char *s) return (args); } -static int mutt_invoke_sendmail (address_t * from, /* the sender */ - address_t * to, address_t * cc, address_t * bcc, /* recips */ - const char *msg, /* file containing message */ - int eightbit) -{ /* message contains 8bit chars */ +int mutt_invoke_mta(address_t *from, address_t *to, address_t *cc, + address_t *bcc, const char *msg, int eightbit) +{ char cmd[LONG_STRING]; char *ps = NULL, *path = NULL, *childout = NULL; const char **args = NULL; @@ -1841,12 +1807,9 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ #ifdef USE_NNTP if (option (OPTNEWSSEND)) { - m_strformat(cmd, sizeof(cmd), 0, Inews, nntp_format_str, 0, 0); - if (m_strisempty(cmd)) { - i = nntp_post (msg); - unlink (msg); - return i; - } + i = nntp_post(msg); + unlink(msg); + return i; } else #endif { @@ -1918,8 +1881,7 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ struct stat st; if (!stat(childout, &st) && st.st_size > 0) - mutt_do_pager(_("Output of the delivery process"), childout, 0, - NULL); + mutt_pager(_("Output of the delivery process"), childout, 0, NULL); } } } else { @@ -1939,22 +1901,6 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ return (i); } -int mutt_invoke_mta (address_t * from, /* the sender */ - address_t * to, address_t * cc, address_t * bcc, /* recips */ - const char *msg, /* file containing message */ - int eightbit) -{ /* message contains 8bit chars */ -#ifdef USE_LIBESMTP -#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); -} - /* For postponing (!final) do the necessary encodings only */ void mutt_prepare_envelope (ENVELOPE * env, int final) { @@ -1985,12 +1931,7 @@ void mutt_prepare_envelope (ENVELOPE * env, int final) rfc2047_encode_adrlist(env->reply_to, "Reply-To"); if (env->subject) -#ifdef USE_NNTP - if (!option (OPTNEWSSEND) || option (OPTMIMESUBJECT)) -#endif - { - rfc2047_encode_string (&env->subject); - } + rfc2047_encode_string (&env->subject); encode_headers (env->userhdrs); } @@ -2037,7 +1978,7 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, if (!fp) fp = msg->fp; - f = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL); + f = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); if (f) { int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM; @@ -2126,8 +2067,8 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, /* We need to add a Content-Length field to avoid problems where a line in * the message body begins with "From " */ - if (f.magic == M_MMDF || f.magic == M_MBOX) { - tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL); + if (f.magic == M_MBOX) { + tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); if (!tempfp) { mutt_error(_("Could not create temporary file")); mx_close_mailbox (&f, NULL); @@ -2144,7 +2085,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, 0); + mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post); /* (postponment) if this was a reply of some sort, contians the * Message-ID: of message replied to. Save it using a special X-Mutt- @@ -2195,19 +2136,6 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, fputc ('\n', msg->fp); } - /* (postponement) if the mail is to be sent through a mixmaster - * chain, save that information - */ - if (post && hdr->chain && hdr->chain) { - string_list_t *p; - - fputs ("X-Mutt-Mix:", msg->fp); - for (p = hdr->chain; p; p = p->next) - fprintf (msg->fp, " %s", (char *) p->data); - - fputc ('\n', msg->fp); - } - if (tempfp) { char sasha[LONG_STRING]; int lines = 0;