/* simple, editor-based message editing */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "copy.h"
-#include "mx.h"
-
-
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <time.h>
/*
* return value:
{
char tmp[_POSIX_PATH_MAX];
char buff[STRING];
- int omagic;
int oerrno;
int rc;
struct stat sb;
time_t mtime = 0;
- size_t size = 0;
+ ssize_t size = 0;
mutt_mktemp (tmp);
- omagic = DefaultMagic;
- DefaultMagic = M_MBOX;
-
- rc = (mx_open_mailbox (tmp, M_NEWFOLDER, &tmpctx) == NULL) ? -1 : 0;
-
- DefaultMagic = omagic;
+ rc = (mx_open_mailbox(tmp, M_NEWFOLDER, &tmpctx) == NULL) ? -1 : 0;
if (rc == -1) {
mutt_error (_("could not create temporary folder: %s"), strerror (errno));
}
rc = mutt_append_message (&tmpctx, ctx, cur, 0, CH_NOLEN |
- ((ctx->magic == M_MBOX
- || ctx->magic == M_MMDF) ? 0 : CH_NOSTATUS));
+ (ctx->magic == M_MBOX ? 0 : CH_NOSTATUS));
oerrno = errno;
mx_close_mailbox (&tmpctx, NULL);
goto bail;
}
- mutt_edit_file (NONULL (Editor), tmp);
+ mutt_edit_file(tmp);
if ((rc = stat (tmp, &sb)) == -1) {
mutt_error (_("Can't stat %s: %s"), tmp, strerror (errno));
}
of = 0;
- cf = ((tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF) ? 0 : CH_NOSTATUS);
+ cf = (tmpctx.magic == M_MBOX ? 0 : CH_NOSTATUS);
if (fgets (buff, sizeof (buff), fp) && is_from (buff, NULL, 0, NULL)) {
- if (tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF)
+ if (tmpctx.magic == M_MBOX)
cf = CH_FROM | CH_FORCE_FROM;
- }
- else
+ } else {
of = M_ADD_FROM;
+ }
/*
* XXX - we have to play games with the message flags to avoid
mx_close_mailbox (&tmpctx, NULL);
bail:
- if (fp)
- fclose (fp);
+ m_fclose(&fp);
if (rc >= 0)
unlink (tmp);