projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename mutt_libesmtp -> send_smtp
[apps/madmutt.git]
/
editmsg.c
diff --git
a/editmsg.c
b/editmsg.c
index
287c72c
..
c66f5ee
100644
(file)
--- a/
editmsg.c
+++ b/
editmsg.c
@@
-9,22
+9,12
@@
/* simple, editor-based message editing */
/* simple, editor-based message editing */
-#i
f HAVE_CONFIG_H
-#
include "config.h"
-#
endif
+#i
nclude <lib-lib/lib-lib.h>
+#
include <lib-ui/curses.h>
+#
include <lib-mx/mx.h>
#include "mutt.h"
#include "copy.h"
#include "mutt.h"
#include "copy.h"
-#include "mailbox.h"
-#include "mx.h"
-
-#include "lib/intl.h"
-#include "lib/str.h"
-
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <time.h>
/*
* return value:
/*
* return value:
@@
-54,6
+44,7
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
struct stat sb;
time_t mtime = 0;
struct stat sb;
time_t mtime = 0;
+ ssize_t size = 0;
mutt_mktemp (tmp);
mutt_mktemp (tmp);
@@
-82,8
+73,10
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
goto bail;
}
goto bail;
}
- if (stat (tmp, &sb) == 0)
+ if (stat (tmp, &sb) == 0)
{
mtime = sb.st_mtime;
mtime = sb.st_mtime;
+ size = sb.st_size;
+ }
/*
* 2002-09-05 me@sigpipe.org
/*
* 2002-09-05 me@sigpipe.org
@@
-93,13
+86,13
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
* remove it, the message will grow by one line each time the user edits
* the message.
*/
* remove it, the message will grow by one line each time the user edits
* the message.
*/
- if (s
b.st_size != 0 && truncate (tmp, sb.st_size - 1
) == -1) {
+ if (s
ize != 0 && truncate (tmp, --size
) == -1) {
mutt_error (_("could not truncate temporary mail folder: %s"),
strerror (errno));
goto bail;
}
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));
if ((rc = stat (tmp, &sb)) == -1) {
mutt_error (_("Can't stat %s: %s"), tmp, strerror (errno));
@@
-112,7
+105,7
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
goto bail;
}
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;
mutt_message (_("Message not modified!"));
rc = 1;
goto bail;
@@
-172,8
+165,7
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
mx_close_mailbox (&tmpctx, NULL);
bail:
mx_close_mailbox (&tmpctx, NULL);
bail:
- if (fp)
- fclose (fp);
+ m_fclose(&fp);
if (rc >= 0)
unlink (tmp);
if (rc >= 0)
unlink (tmp);