projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ADDRESS -> address_t
[apps/madmutt.git]
/
edit.c
diff --git
a/edit.c
b/edit.c
index
07bc98d
..
d4bcc68
100644
(file)
--- a/
edit.c
+++ b/
edit.c
@@
-66,7
+66,7
@@
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
tmp[sizeof (tmp) - 1] = 0;
if (prefix) {
tmp[sizeof (tmp) - 1] = 0;
if (prefix) {
-
strfcpy (tmp, NONULL (Prefix), sizeof (tmp
));
+
m_strcpy(tmp, sizeof(tmp), NONULL(Prefix
));
tmplen = m_strlen(tmp);
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
tmplen = m_strlen(tmp);
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
@@
-247,7
+247,7
@@
static void be_edit_header (ENVELOPE * e, int force)
if (!e->subject || force) {
addstr ("Subject: ");
if (!e->subject || force) {
addstr ("Subject: ");
-
strfcpy (tmp, e->subject ? e->subject : "", sizeof (tmp
));
+
m_strcpy(tmp, sizeof(tmp), NONULL(e->subject
));
if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0)
str_replace (&e->subject, tmp);
addch ('\n');
if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0)
str_replace (&e->subject, tmp);
addch ('\n');
@@
-324,8
+324,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
while (p >= tmp && ISSPACE (*p))
*p-- = 0;
while (p >= tmp && ISSPACE (*p))
*p-- = 0;
- p = tmp + 2;
- SKIPWS (p);
+ p = vskipspaces(tmp + 2);
switch (tmp[1]) {
case '?':
switch (tmp[1]) {
case '?':
@@
-375,7
+374,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
break;
case 'r':
if (*p) {
break;
case 'r':
if (*p) {
-
strncpy (tmp, p, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), p
);
mutt_expand_path (tmp, sizeof (tmp));
buf = be_snarf_file (tmp, buf, &bufmax, &buflen, 1);
}
mutt_expand_path (tmp, sizeof (tmp));
buf = be_snarf_file (tmp, buf, &bufmax, &buflen, 1);
}
@@
-392,7
+391,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
case 'u':
if (buflen) {
buflen--;
case 'u':
if (buflen) {
buflen--;
-
strfcpy (tmp, buf[buflen], sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), buf[buflen]
);
tmp[m_strlen(tmp) - 1] = 0;
p_delete(&buf[buflen]);
buf[buflen] = NULL;
tmp[m_strlen(tmp) - 1] = 0;
p_delete(&buf[buflen]);
buf[buflen] = NULL;
@@
-440,7
+439,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
else if (m_strcmp(".", tmp) == 0)
done = 1;
else {
else if (m_strcmp(".", tmp) == 0)
done = 1;
else {
-
str_cat (tmp, sizeof
(tmp), "\n");
+
m_strcat(tmp, sizeof
(tmp), "\n");
if (buflen == bufmax)
p_realloc(&buf, bufmax += 25);
buf[buflen++] = m_strdup(tmp[1] == '~' ? tmp + 1 : tmp);
if (buflen == bufmax)
p_realloc(&buf, bufmax += 25);
buf[buflen++] = m_strdup(tmp[1] == '~' ? tmp + 1 : tmp);