* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.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 "alias.h"
#include "recvattach.h"
#include "sort.h"
#include "charset.h"
-#include "mx.h"
#include "buffy.h"
-#include "compose.h"
#ifdef MIXMASTER
#include "remailer.h"
#endif
#ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
#endif
static const char *There_are_no_attachments = N_("There are no attachments.");
static int edit_address_list (int line, address_t ** addr)
{
char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */
- const char *err = NULL;
+ char *err = NULL;
mutt_addrlist_to_local (*addr);
rfc822_write_address (buf, sizeof (buf), *addr, 0);
idx[x]->content->next = NULL;
idx[x]->content->parts = NULL;
- mutt_free_body (&(idx[x]->content));
+ body_list_wipe(&(idx[x]->content));
p_delete(&idx[x]->tree);
p_delete(&idx[x]);
for (; x < *idxlen - 1; x++)
* help when modifying this function.
*/
+static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
+ const char *p);
+
static const char *compose_format_str (char *buf, ssize_t buflen, char op,
const char *src, const char *prefix,
const char *ifstring,
*/
int mutt_compose_menu (HEADER * msg, /* structure for new message */
char *fcc, /* where to save a copy of the message */
- ssize_t fcclen, HEADER * cur)
+ ssize_t fcclen,
+ HEADER * cur __attribute__ ((unused)))
{ /* current message */
char helpstr[SHORT_STRING];
char buf[LONG_STRING];
if ((op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
const char *tag = NULL;
- const char *err = NULL;
+ char *err = NULL;
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
p_delete(&idx[idxlen]);
continue;
}
- fclose (fp);
+ m_fclose(&fp);
if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) {
mutt_error
idx[idxlen]->content->parts = NULL;
if (idx[idxlen]->unowned)
idx[idxlen]->content->unlink = 0;
- mutt_free_body (&idx[idxlen]->content);
+ body_list_wipe(&idx[idxlen]->content);
p_delete(&idx[idxlen]->tree);
p_delete(&idx[idxlen]);
}