X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=5df5166a79ccc56b8f45fd68325f0ca95e285599;hp=0f676b901b55b1ce75f53470afa277ba0bb118b0;hb=6920eb5798f2d9f25e5ea1af2ba86122cf408bd1;hpb=fc854762626c5e2dce8c5618860a882934ec81d2 diff --git a/sendlib.c b/sendlib.c index 0f676b9..5df5166 100644 --- a/sendlib.c +++ b/sendlib.c @@ -10,32 +10,23 @@ #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 -#endif - #ifdef HAVE_SYSEXITS_H #include #else /* Make sure EX_OK is defined */ @@ -333,14 +324,14 @@ int mutt_write_mime_header (BODY * a, FILE * f) fprintf (f, "Content-Transfer-Encoding: %s\n", ENCODING (a->encoding)); /* Do NOT add the terminator here!!! */ - return (ferror (f) ? -1 : 0); + return ferror (f) ? -1 : 0; } int mutt_write_mime_body (BODY * a, FILE * f) { const char *p; - char boundary[SHORT_STRING]; - char send_charset[SHORT_STRING]; + char boundary[STRING]; + char send_charset[STRING]; FILE *fpin; BODY *t; fgetconv_t *fc; @@ -350,7 +341,7 @@ int mutt_write_mime_body (BODY * a, FILE * f) if (!(p = parameter_getval(a->parameter, "boundary"))) { mutt_error _("No boundary parameter found! [report this error]"); - return (-1); + return -1; } m_strcpy(boundary, sizeof(boundary), p); @@ -363,7 +354,7 @@ int mutt_write_mime_body (BODY * a, FILE * f) return -1; } fprintf (f, "\n--%s--\n", boundary); - return (ferror (f) ? -1 : 0); + return ferror (f) ? -1 : 0; } /* This is pretty gross, but it's the best solution for now... */ @@ -398,7 +389,7 @@ int mutt_write_mime_body (BODY * a, FILE * f) fgetconv_close (&fc); m_fclose(&fpin); - return (ferror (f) ? -1 : 0); + return ferror (f) ? -1 : 0; } typedef struct { @@ -538,7 +529,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; @@ -646,9 +636,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, p_delete(&states); return ret; -#else - return -1; -#endif /* !HAVE_ICONV */ } /* @@ -758,7 +745,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) } if ((fp = fopen (fname, "r")) == NULL) { - return (NULL); + return NULL; } info = p_new(CONTENT, 1); @@ -766,10 +753,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 ? ((FileCharset && *FileCharset) ? - FileCharset : Charset) : Charset; - if (Charset && (chs || SendCharset) && - convert_file_from_to (fp, fchs, chs ? chs : SendCharset, + 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); @@ -792,7 +779,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" - : Charset && !charset_is_us_ascii(Charset) ? Charset : "unknown-8bit")); + : mod_cset.charset && !charset_is_us_ascii(mod_cset.charset) + ? mod_cset.charset : "unknown-8bit")); return info; } @@ -828,7 +816,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path) */ switch (count) { case 0: - snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL (Homedir)); + snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(mod_core.homedir)); break; case 1: m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types"); @@ -898,7 +886,7 @@ bye: m_strreplace(&att->xtype, xtype); } - return (type); + return type; } void mutt_message_to_7bit (BODY * a, FILE * fp) @@ -924,7 +912,7 @@ void mutt_message_to_7bit (BODY * a, FILE * fp) a->length = sb.st_size; } - fpout = m_tempfile(temp, sizeof(temp), NONULL(Tempdir), NULL); + fpout = m_tempfile(temp, sizeof(temp), NONULL(mod_core.tmpdir), NULL); if (!fpout) { mutt_error(_("Could not create temporary file")); goto cleanup; @@ -982,14 +970,14 @@ static void transform_to_7bit (BODY * a, FILE * fpin) transform_to_7bit (a->parts, fpin); } - else if (mutt_is_message_type (a->type, a->subtype)) { + else if (mutt_is_message_type(a)) { mutt_message_to_7bit (a, fpin); } else { a->noconv = 1; a->force_charset = 1; - s.fpout = m_tempfile(buff, sizeof(buff), NONULL(Tempdir), NULL); + s.fpout = m_tempfile(buff, sizeof(buff), NONULL(mod_core.tmpdir), NULL); if (!s.fpout) { mutt_error(_("Could not create temporary file")); return; @@ -1018,7 +1006,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin) /* determine which Content-Transfer-Encoding to use */ static void mutt_set_encoding (BODY * b, CONTENT * info) { - char send_charset[SHORT_STRING]; + char send_charset[STRING]; if (b->type == TYPETEXT) { char *chsname = @@ -1109,11 +1097,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(Tempdir), NULL); + fp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL); if (!fp) return NULL; @@ -1170,7 +1156,7 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg) m_fclose(&fp); - return (body); + return body; } BODY *mutt_make_file_attach (const char *path) @@ -1257,17 +1243,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); + time_t t = time(NULL); + const char *loc; - tz /= 60; - - 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 @@ -1279,9 +1261,7 @@ mutt_write_address_list(address_t *addr, FILE *fp, int linelen, int display) while (addr) { char buf[LONG_STRING]; - int len; - - len = rfc822_write_address_single(buf, ssizeof(buf), addr, display); + int len = rfc822_addrcpy(buf, ssizeof(buf), addr, display); if (!first) { if (linelen + len > 74) { @@ -1353,32 +1333,24 @@ 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; string_list_t *tmp = env->userhdrs; int has_agent = 0; /* user defined user-agent header field exists */ -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - if (mode == 0 && !privacy) - fputs (mutt_make_date (buffer, sizeof (buffer)), fp); + 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_write_address (buffer, sizeof (buffer), env->from, 0); + rfc822_addrcat(buffer, sizeof(buffer), env->from, 0); fprintf (fp, "From: %s\n", buffer); } @@ -1387,22 +1359,16 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, mutt_write_address_list (env->to, fp, 4, 0); } else if (mode > 0) -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - if (edit_header(mode, "To:")) - fputs ("To:\n", fp); + if (edit_header(mode, "To:")) + fputs ("To:\n", fp); if (env->cc) { fputs ("Cc: ", fp); mutt_write_address_list (env->cc, fp, 4, 0); } else if (mode > 0) -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - if (edit_header(mode, "Cc:")) - fputs ("Cc:\n", fp); + if (edit_header(mode, "Cc:")) + fputs ("Cc:\n", fp); if (env->bcc) { if (mode != 0 || option (OPTWRITEBCC)) { @@ -1411,29 +1377,8 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, } } else if (mode > 0) -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - if (edit_header(mode, "Bcc:")) - fputs ("Bcc:\n", fp); - -#ifdef USE_NNTP - if (env->newsgroups) - fprintf (fp, "Newsgroups: %s\n", env->newsgroups); - else if (mode == 1 && option (OPTNEWSSEND) && edit_header(mode, "Newsgroups:")) - fputs ("Newsgroups:\n", fp); - - if (env->followup_to) - 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 (edit_header(mode, "Bcc:")) + fputs ("Bcc:\n", fp); if (env->subject) fprintf (fp, "Subject: %s\n", env->subject); @@ -1441,7 +1386,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) { @@ -1451,14 +1396,10 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, else if (mode > 0 && edit_header(mode, "Reply-To:")) fputs ("Reply-To:\n", fp); - if (env->mail_followup_to) -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - { - fputs ("Mail-Followup-To: ", fp); - mutt_write_address_list (env->mail_followup_to, fp, 18, 0); - } + if (env->mail_followup_to) { + fputs ("Mail-Followup-To: ", fp); + mutt_write_address_list (env->mail_followup_to, fp, 18, 0); + } if (mode <= 0) { if (env->references) { @@ -1488,8 +1429,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,20 +1436,16 @@ 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", madmutt_version, + mod_core.operating_system); } else { - struct utsname un; - os = (uname(&un) == -1) ? "UNIX" : un.sysname; + fprintf(fp, "User-Agent: %s\n", madmutt_version); } - /* Add a vanity header */ - fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os); } - return (ferror (fp) == 0 ? 0 : -1); + return ferror (fp) == 0 ? 0 : -1; } static void encode_headers (string_list_t * h) @@ -1539,23 +1474,22 @@ static void encode_headers (string_list_t * h) } } -const char *mutt_fqdn (short may_hide_host) +const char *mutt_fqdn(short may_hide_host) { char *p = NULL, *q; - if (Fqdn && Fqdn[0] != '@') { - p = Fqdn; + if (mod_core.hostname && mod_core.hostname[0] != '@') { + p = mod_core.hostname; if (may_hide_host && option (OPTHIDDENHOST)) { - if ((p = strchr (Fqdn, '.'))) + if ((p = strchr(mod_core.hostname, '.'))) p++; /* sanity check: don't hide the host if - * the fqdn is something like detebe.org. - */ + the fqdn is something like detebe.org. */ - if (!p || !(q = strchr (p, '.'))) - p = Fqdn; + if (!p || !(q = strchr(p, '.'))) + p = mod_core.hostname; } } @@ -1653,19 +1587,19 @@ static void mutt_gen_localpart(char *buf, unsigned int len, const char *fmt) static char *mutt_gen_msgid (void) { - char buf[SHORT_STRING]; - char localpart[SHORT_STRING]; + char buf[STRING]; + char localpart[STRING]; const char *fqdn; if (!(fqdn = mutt_fqdn(0))) - fqdn = NONULL(Hostname); + 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; } @@ -1691,7 +1625,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) sigaddset (&set, SIGTSTP); sigprocmask (SIG_BLOCK, &set, NULL); - if (SendmailWait >= 0) { + if (MTransport.sendmail_wait >= 0) { char tmp[_POSIX_PATH_MAX]; mutt_mktemp (tmp); @@ -1722,7 +1656,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) } unlink (msg); - if (SendmailWait >= 0) { + if (MTransport.sendmail_wait >= 0) { /* *tempfile will be opened as stdout */ if (open (*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0) @@ -1730,8 +1664,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) /* redirect stderr to *tempfile too */ if (dup (1) < 0) _exit (S_ERR); - } - else { + } else { if (open ("/dev/null", O_WRONLY | O_APPEND) < 0) /* stdout */ _exit (S_ERR); if (open ("/dev/null", O_RDWR | O_APPEND) < 0) /* stderr */ @@ -1747,11 +1680,11 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) _exit (S_ERR); } - /* SendmailWait > 0: interrupt waitpid() after SendmailWait seconds - * SendmailWait = 0: wait forever - * SendmailWait < 0: don't wait + /* sendmail_wait > 0: interrupt waitpid() after sendmail_wait seconds + * sendmail_wait = 0: wait forever + * sendmail_wait < 0: don't wait */ - if (SendmailWait > 0) { + if (MTransport.sendmail_wait > 0) { SigAlrm = 0; act.sa_handler = alarm_handler; #ifdef SA_INTERRUPT @@ -1762,21 +1695,20 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) #endif sigemptyset (&act.sa_mask); sigaction (SIGALRM, &act, &oldalrm); - alarm (SendmailWait); + alarm (MTransport.sendmail_wait); } - else if (SendmailWait < 0) + else if (MTransport.sendmail_wait < 0) _exit (0xff & EX_OK); if (waitpid (pid, &st, 0) > 0) { st = WIFEXITED (st) ? WEXITSTATUS (st) : S_ERR; - if (SendmailWait && st == (0xff & EX_OK)) { + if (MTransport.sendmail_wait && st == (0xff & EX_OK)) { unlink (*tempfile); /* no longer needed */ p_delete(tempfile); } - } - else { - st = (SendmailWait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR; - if (SendmailWait > 0) { + } else { + st = (MTransport.sendmail_wait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR; + if (MTransport.sendmail_wait > 0) { unlink (*tempfile); p_delete(tempfile); } @@ -1804,7 +1736,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) mutt_unblock_signals_system (1); - return (st); + return st; } static const char ** @@ -1818,7 +1750,7 @@ add_args(const char **args, ssize_t *argslen, ssize_t *argsmax, address_t * addr args[(*argslen)++] = addr->mailbox; } } - return (args); + return args; } static const char ** @@ -1828,40 +1760,23 @@ add_option(const char **args, ssize_t *argslen, ssize_t *argsmax, const char *s) p_realloc(&args, *argsmax += 5); } args[(*argslen)++] = s; - return (args); + 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 */ - char *ps = NULL, *path = NULL, *s = NULL, *childout = NULL; +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; ssize_t argslen = 0, argsmax = 0; int i; -#ifdef USE_NNTP - if (option (OPTNEWSSEND)) { - char cmd[LONG_STRING]; - - mutt_FormatString (cmd, sizeof (cmd), NONULL (Inews), nntp_format_str, 0, - 0); - if (m_strisempty(cmd)) { - i = nntp_post (msg); - unlink (msg); - return i; - } - - s = m_strdup(cmd); - } - else -#endif - s = m_strdup(Sendmail); + m_strcpy(cmd, sizeof(cmd), MTransport.sendmail); - ps = s; + ps = cmd; i = 0; - while ((ps = strtok (ps, " "))) { + while ((ps = strtok(ps, " "))) { if (argslen == argsmax) p_realloc(&args, argsmax += 5); @@ -1880,38 +1795,30 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ i++; } -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) { -#endif - if (eightbit && option (OPTUSE8BITMIME)) - args = add_option(args, &argslen, &argsmax, "-B8BITMIME"); - - if (option (OPTENVFROM)) { - address_t *f = EnvFrom; - 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"); - args = add_option (args, &argslen, &argsmax, DsnNotify); - } - if (DsnReturn) { - args = add_option (args, &argslen, &argsmax, "-R"); - args = add_option (args, &argslen, &argsmax, DsnReturn); + if (eightbit && MTransport.use_8bitmime) + args = add_option(args, &argslen, &argsmax, "-B8BITMIME"); + + if (MTransport.use_envelope_from) { + address_t *f = MTransport.envelope_from_address; + if (!f && from && !from->next) + f = from; + if (f) { + args = add_option (args, &argslen, &argsmax, "-f"); + args = add_args (args, &argslen, &argsmax, f); } - args = add_option (args, &argslen, &argsmax, "--"); - args = add_args (args, &argslen, &argsmax, to); - args = add_args (args, &argslen, &argsmax, cc); - args = add_args (args, &argslen, &argsmax, bcc); -#ifdef USE_NNTP } -#endif + if (MTransport.dsn_notify) { + args = add_option (args, &argslen, &argsmax, "-N"); + args = add_option (args, &argslen, &argsmax, MTransport.dsn_notify); + } + if (MTransport.dsn_return) { + args = add_option (args, &argslen, &argsmax, "-R"); + args = add_option (args, &argslen, &argsmax, MTransport.dsn_return); + } + args = add_option (args, &argslen, &argsmax, "--"); + args = add_args (args, &argslen, &argsmax, to); + args = add_args (args, &argslen, &argsmax, cc); + args = add_args (args, &argslen, &argsmax, bcc); if (argslen >= argsmax) p_realloc(&args, ++argsmax); @@ -1926,8 +1833,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 { @@ -1936,7 +1842,6 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ p_delete(&childout); p_delete(&path); - p_delete(&s); p_delete(&args); if (i == (EX_OK & 0xff)) @@ -1945,23 +1850,7 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ i = 1; else i = -1; - 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); + return i; } /* For postponing (!final) do the necessary encodings only */ @@ -1994,31 +1883,26 @@ 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); } void mutt_unprepare_envelope (ENVELOPE * env) { - string_list_t *item; + string_list_t *item; - for (item = env->userhdrs; item; item = item->next) - rfc2047_decode (&item->data); + for (item = env->userhdrs; item; item = item->next) + rfc2047_decode(&item->data); - address_list_wipe(&env->mail_followup_to); + address_list_wipe(&env->mail_followup_to); - /* back conversions */ - rfc2047_decode_adrlist (env->to); - rfc2047_decode_adrlist (env->cc); - rfc2047_decode_adrlist (env->bcc); - rfc2047_decode_adrlist (env->from); - rfc2047_decode_adrlist (env->reply_to); - rfc2047_decode (&env->subject); + /* back conversions */ + rfc2047_decode_adrlist(env->to); + rfc2047_decode_adrlist(env->cc); + rfc2047_decode_adrlist(env->bcc); + rfc2047_decode_adrlist(env->from); + rfc2047_decode_adrlist(env->reply_to); + rfc2047_decode(&env->subject); } static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, @@ -2026,7 +1910,7 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, { int i, ret = 0; FILE *f; - char date[SHORT_STRING], tempfile[_POSIX_PATH_MAX]; + char date[STRING], tempfile[_POSIX_PATH_MAX]; MESSAGE *msg = NULL; if (!h) { @@ -2046,7 +1930,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(Tempdir), NULL); + f = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); if (f) { int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM; @@ -2078,7 +1962,6 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to) { address_t *from; - const char *fqdn = mutt_fqdn (1); char resent_from[STRING]; int ret; char *err; @@ -2086,24 +1969,16 @@ int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to) resent_from[0] = '\0'; from = mutt_default_from (); - if (fqdn) - rfc822_qualify (from, fqdn); + rfc822_qualify(from, mutt_fqdn(1)); - rfc2047_encode_adrlist (from, "Resent-From"); + rfc2047_encode_adrlist(from, "Resent-From"); if (mutt_addrlist_to_idna (from, &err)) { mutt_error (_("Bad IDN %s while preparing resent-from."), err); return -1; } - rfc822_write_address (resent_from, sizeof (resent_from), from, 0); - -#ifdef USE_NNTP - unset_option (OPTNEWSSEND); -#endif - + rfc822_addrcat(resent_from, sizeof(resent_from), from, 0); ret = _mutt_bounce_message (fp, h, to, resent_from, from); - address_list_wipe(&from); - return ret; } @@ -2131,14 +2006,14 @@ 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) { - return (-1); + return -1; } /* 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(Tempdir), 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); @@ -2149,14 +2024,13 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, hdr->read = !post; /* make sure to put it in the `cur' directory (maildir) */ if ((msg = mx_open_new_message (&f, hdr, M_ADD_FROM)) == NULL) { mx_close_mailbox (&f, NULL); - return (-1); + return -1; } /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header() * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header() * */ - mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, - 0); + mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post); /* (postponment) if this was a reply of some sort, contians the * Message-ID: of message replied to. Save it using a special X-Mutt- @@ -2174,8 +2048,6 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, fprintf (msg->fp, "X-Mutt-Fcc: %s\n", fcc); fprintf (msg->fp, "Status: RO\n"); - - /* (postponment) if the mail is to be signed or encrypted, save this info */ if (post && (hdr->security & APPLICATION_PGP)) { fputs ("X-Mutt-PGP: ", msg->fp); @@ -2209,19 +2081,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; @@ -2263,8 +2122,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, /* if there was an error, leave the temp version */ if (!r) unlink (tempfile); - } - else { + } else { fputc ('\n', msg->fp); /* finish off the header */ r = mutt_write_mime_body (hdr->content, msg->fp); }