projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less horrible strncpy's
[apps/madmutt.git]
/
compose.c
diff --git
a/compose.c
b/compose.c
index
f5d6d2b
..
a0eb9ac
100644
(file)
--- a/
compose.c
+++ b/
compose.c
@@
-18,6
+18,7
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "enter.h"
#include "mutt.h"
#include "enter.h"
@@
-479,7
+480,7
@@
static const char *compose_format_str (char *buf, size_t buflen, char op,
break;
case 'v':
break;
case 'v':
-
strncpy (buf, mutt_make_version (0), buflen
);
+
m_strcpy(buf, buflen, mutt_make_version (0)
);
break;
case 0:
break;
case 0:
@@
-696,7
+697,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_MESSAGE:
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_MESSAGE:
- if (Editor && (
str_cmp
("builtin", Editor) != 0)
+ if (Editor && (
m_strcmp
("builtin", Editor) != 0)
&& !option (OPTEDITHDRS)) {
mutt_edit_file (Editor, msg->content->filename);
mutt_update_encoding (msg->content);
&& !option (OPTEDITHDRS)) {
mutt_edit_file (Editor, msg->content->filename);
mutt_update_encoding (msg->content);
@@
-706,10
+707,11
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
}
/* fall through */
case OP_COMPOSE_EDIT_HEADERS:
}
/* fall through */
case OP_COMPOSE_EDIT_HEADERS:
- if (
str_cmp
("builtin", Editor) != 0 &&
+ if (
m_strcmp
("builtin", Editor) != 0 &&
(op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
(op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
- const char *tag = NULL, *err = NULL;
+ const char *tag = NULL;
+ char *err = NULL;
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,