/* simple, editor-based message editing */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "copy.h"
-#include "mailbox.h"
-#include "mx.h"
-
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <time.h>
/*
* return value:
struct stat sb;
time_t mtime = 0;
+ ssize_t size = 0;
mutt_mktemp (tmp);
}
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;
}
- if (stat (tmp, &sb) == 0)
+ if (stat (tmp, &sb) == 0) {
mtime = sb.st_mtime;
+ size = sb.st_size;
+ }
/*
* 2002-09-05 me@sigpipe.org
* remove it, the message will grow by one line each time the user edits
* the message.
*/
- if (sb.st_size != 0 && truncate (tmp, sb.st_size - 1) == -1) {
+ if (size != 0 && truncate (tmp, --size) == -1) {
mutt_error (_("could not truncate temporary mail folder: %s"),
strerror (errno));
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));
goto bail;
}
- if (sb.st_mtime == mtime) {
+ if (sb.st_mtime == mtime && sb.st_size == size) {
mutt_message (_("Message not modified!"));
rc = 1;
goto bail;
}
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);