/*
+ * Copyright notice from original mutt:
* Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
- *
- * 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.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
-#include "mime.h"
-#include "mailbox.h"
+#include "alias.h"
+#include "state.h"
+#include "handler.h"
+#include "recvattach.h"
#include "attach.h"
-#include "mapping.h"
-#include "mx.h"
#include "copy.h"
#include "mutt_idna.h"
+
/* some helper functions to verify that we are exclusively operating
* on message/rfc822 attachments
*/
/**
- **
** The bounce function, from the attachment menu
- **
**/
-void mutt_attach_bounce (FILE * fp, HEADER * hdr,
+void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
ATTACHPTR ** idx, short idxlen, BODY * cur)
{
short i;
char prompt[STRING];
char buf[HUGE_STRING];
char *err = NULL;
- ADDRESS *adr = NULL;
+ address_t *adr = NULL;
int ret = 0;
int p = 0;
p = (cur || count_tagged (idx, idxlen) == 1);
if (p)
- strfcpy (prompt, _("Bounce message to: "), sizeof (prompt));
+ m_strcpy(prompt, sizeof(prompt), _("Bounce message to: "));
else
- strfcpy (prompt, _("Bounce tagged messages to: "), sizeof (prompt));
+ m_strcpy(prompt, sizeof(prompt), _("Bounce tagged messages to: "));
buf[0] = '\0';
if (mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS)
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
- FREE (&err);
- rfc822_free_address (&adr);
+ p_delete(&err);
+ address_list_wipe(&adr);
return;
}
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
- safe_strcat (prompt, sizeof (prompt), "...?");
+ m_strcat(prompt, sizeof(prompt), "...?");
+ } else {
+ m_strcat(prompt, sizeof(prompt), "?");
}
- else
- safe_strcat (prompt, sizeof (prompt), "?");
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
- rfc822_free_address (&adr);
+ address_list_wipe(&adr);
CLEARLINE (LINES - 1);
mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
return;
/**
- **
** resend-message, from the attachment menu
- **
- **
**/
-void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
+void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
short idxlen, BODY * cur)
{
short i;
\f
/**
- **
** forward-message, from the attachment menu
- **
**/
/* try to find a common parent message for the tagged attachments. */
if (quote) {
if (_prefix)
- strfcpy (prefix, _prefix, sizeof (prefix));
+ m_strcpy(prefix, sizeof(prefix), _prefix);
else if (!option (OPTTEXTFLOWED))
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
Context, hdr, 0);
else
- strfcpy (prefix, ">", sizeof (prefix));
+ m_strcpy(prefix, sizeof(prefix), ">");
chflags |= CH_PREFIX;
}
mutt_copy_header (ifp, hdr, ofp, chflags, quote ? prefix : NULL);
}
+/* create a send-mode duplicate from a receive-mode body */
+static int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
+{
+ char tmp[_POSIX_PATH_MAX];
+ BODY *b;
+
+ parameter_t *par, **ppar;
+
+ short use_disp;
+
+ if (src->filename) {
+ use_disp = 1;
+ m_strcpy(tmp, sizeof(tmp), src->filename);
+ }
+ else {
+ use_disp = 0;
+ tmp[0] = '\0';
+ }
+
+ mutt_adv_mktemp (NULL, tmp, sizeof (tmp));
+ if (mutt_save_attachment (fp, src, tmp, 0, NULL) == -1)
+ return -1;
+
+ *tgt = body_new();
+ b = *tgt;
+
+ memcpy (b, src, sizeof (BODY));
+ b->parts = NULL;
+ b->next = NULL;
+
+ b->filename = m_strdup(tmp);
+ b->use_disp = use_disp;
+ b->unlink = 1;
+
+ if (mutt_is_text_part (b))
+ b->noconv = 1;
+
+ b->xtype = m_strdup(b->xtype);
+ b->subtype = m_strdup(b->subtype);
+ b->form_name = m_strdup(b->form_name);
+ b->filename = m_strdup(b->filename);
+ b->d_filename = m_strdup(b->d_filename);
+ b->description = m_strdup(b->description);
+
+ /*
+ * we don't seem to need the HEADER structure currently.
+ * XXX - this may change in the future
+ */
+
+ if (b->hdr)
+ b->hdr = NULL;
+
+ /* copy parameters */
+ for (par = b->parameter, ppar = &b->parameter; par;
+ ppar = &(*ppar)->next, par = par->next) {
+ *ppar = parameter_new();
+ (*ppar)->attribute = m_strdup(par->attribute);
+ (*ppar)->value = m_strdup(par->value);
+ }
+
+ mutt_stamp_attachment (b);
+
+ return 0;
+}
+
/* Attach all the body parts which can't be decoded.
* This code is shared by forwarding and replying. */
parent = hdr;
- tmphdr = mutt_new_header ();
- tmphdr->env = mutt_new_envelope ();
+ tmphdr = header_new();
+ tmphdr->env = envelope_new();
mutt_make_forward_subject (tmphdr->env, Context, parent);
mutt_mktemp (tmpbody);
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
parent, 0);
else
- strfcpy (prefix, ">", sizeof (prefix));
+ m_strcpy(prefix, sizeof(prefix), ">");
}
include_header (option (OPTFORWQUOTE), fp, parent, tmpfp, prefix);
/* initialize a state structure */
- memset (&st, 0, sizeof (st));
+ p_clear(&st, 1);
if (option (OPTFORWQUOTE))
st.prefix = prefix;
mutt_unlink (tmpbody);
}
- mutt_free_header (&tmphdr);
+ header_delete(&tmphdr);
}
* the attachment index.
*/
-static void attach_forward_msgs (FILE * fp, HEADER * hdr,
+static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)),
ATTACHPTR ** idx, short idxlen, BODY * cur,
int flags)
{
}
}
- tmphdr = mutt_new_header ();
- tmphdr->env = mutt_new_envelope ();
+ tmphdr = header_new();
+ tmphdr->env = envelope_new();
mutt_make_forward_subject (tmphdr->env, Context, curhdr);
mutt_mktemp (tmpbody);
if (!(tmpfp = safe_fopen (tmpbody, "w"))) {
mutt_error (_("Can't create %s."), tmpbody);
- mutt_free_header (&tmphdr);
+ header_delete(&tmphdr);
return;
}
}
}
else
- mutt_free_header (&tmphdr);
+ header_delete(&tmphdr);
ci_send_message (flags, tmphdr, *tmpbody ? tmpbody : NULL, NULL, curhdr);
/**
- **
** the various reply functions, from the attachment menu
- **
- **
**/
/* Create the envelope defaults for a reply.
if ((flags & SENDNEWS)) {
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
- mutt_strcasecmp (curenv->followup_to, "poster"))
- env->newsgroups = safe_strdup (curenv->followup_to);
+ m_strcasecmp(curenv->followup_to, "poster"))
+ env->newsgroups = m_strdup(curenv->followup_to);
}
else
#endif
if (parent)
mutt_add_to_reference_headers (env, curenv, NULL, NULL);
else {
- LIST **p = NULL, **q = NULL;
+ string_list_t **p = NULL, **q = NULL;
for (i = 0; i < idxlen; i++) {
if (idx[i]->content->tagged)
/* This is _very_ similar to send.c's include_reply(). */
static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
- int flags)
+ int flags __attribute__ ((unused)))
{
int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV;
int chflags = CH_DECODE;
else if (nattach == 1)
mime_reply_any = 1;
- tmphdr = mutt_new_header ();
- tmphdr->env = mutt_new_envelope ();
+ tmphdr = header_new();
+ tmphdr->env = envelope_new();
if (attach_reply_envelope_defaults (tmphdr->env, idx, idxlen,
parent ? parent : (cur ? cur->
hdr : NULL),
flags) == -1) {
- mutt_free_header (&tmphdr);
+ header_delete(&tmphdr);
return;
}
mutt_mktemp (tmpbody);
if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) {
mutt_error (_("Can't create %s."), tmpbody);
- mutt_free_header (&tmphdr);
+ header_delete(&tmphdr);
return;
}
else {
mutt_make_attribution (Context, parent, tmpfp);
- memset (&st, 0, sizeof (STATE));
+ p_clear(&st, 1);
st.fpin = fp;
st.fpout = tmpfp;
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
Context, parent, 0);
else
- strfcpy (prefix, ">", sizeof (prefix));
+ m_strcpy(prefix, sizeof(prefix), ">");
st.prefix = prefix;
st.flags = M_CHARCONV;
if (mime_reply_any && !cur &&
copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
0) == NULL) {
- mutt_free_header (&tmphdr);
+ header_delete(&tmphdr);
fclose (tmpfp);
return;
}