#include <lib-sys/exit.h>
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
-#include <lib-ui/enter.h>
#include <lib-ui/lib-ui.h>
#include <lib-mx/mx.h>
#include "charset.h"
#include "mutt_idna.h"
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
-
#ifdef HAVE_SYSEXITS_H
#include <sysexits.h>
#else /* Make sure EX_OK is defined <philiph@pobox.com> */
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
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)
- 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
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)) {
}
}
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);
-#endif
+ if (edit_header(mode, "Bcc:"))
+ fputs ("Bcc:\n", fp);
if (env->subject)
fprintf (fp, "Subject: %s\n", env->subject);
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) {
ssize_t argslen = 0, argsmax = 0;
int i;
-#ifdef USE_NNTP
- if (option (OPTNEWSSEND)) {
- i = nntp_post(msg);
- unlink(msg);
- return i;
- } else
-#endif
- {
- m_strcpy(cmd, sizeof(cmd), MTransport.sendmail);
- }
+ m_strcpy(cmd, sizeof(cmd), MTransport.sendmail);
ps = cmd;
i = 0;
i++;
}
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND)) {
-#endif
- 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);
- }
- }
- 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);
+ 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);
return -1;
}
rfc822_addrcat(resent_from, sizeof(resent_from), from, 0);
-
-#ifdef USE_NNTP
- unset_option (OPTNEWSSEND);
-#endif
-
ret = _mutt_bounce_message (fp, h, to, resent_from, from);
-
address_list_wipe(&from);
-
return ret;
}