projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace deprecated luaL_openlib() by luaL_register()
[apps/madmutt.git]
/
editmsg.c
diff --git
a/editmsg.c
b/editmsg.c
index
a11a5e4
..
41895aa
100644
(file)
--- a/
editmsg.c
+++ b/
editmsg.c
@@
-9,21
+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/lib-ui.h>
+#
include <lib-mx/mx.h>
#include "mutt.h"
#include "copy.h"
#include "mutt.h"
#include "copy.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:
@@
-37,7
+28,6
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
{
char tmp[_POSIX_PATH_MAX];
char buff[STRING];
{
char tmp[_POSIX_PATH_MAX];
char buff[STRING];
- int omagic;
int oerrno;
int rc;
int oerrno;
int rc;
@@
-53,16
+43,11
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
struct stat sb;
time_t mtime = 0;
struct stat sb;
time_t mtime = 0;
- size_t size = 0;
+ s
s
ize_t size = 0;
mutt_mktemp (tmp);
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));
if (rc == -1) {
mutt_error (_("could not create temporary folder: %s"), strerror (errno));
@@
-70,8
+55,7
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
}
rc = mutt_append_message (&tmpctx, ctx, cur, 0, CH_NOLEN |
}
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);
oerrno = errno;
mx_close_mailbox (&tmpctx, NULL);
@@
-95,13
+79,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));
@@
-133,14
+117,14
@@
static int edit_one_message (CONTEXT * ctx, HEADER * cur)
}
of = 0;
}
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 (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;
cf = CH_FROM | CH_FORCE_FROM;
- }
- else
+ } else {
of = M_ADD_FROM;
of = M_ADD_FROM;
+ }
/*
* XXX - we have to play games with the message flags to avoid
/*
* XXX - we have to play games with the message flags to avoid
@@
-174,8
+158,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);