projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
edit.c
diff --git
a/edit.c
b/edit.c
index
b9ffe18
..
d3818f6
100644
(file)
--- a/
edit.c
+++ b/
edit.c
@@
-63,7
+63,7
@@
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
tmp[sizeof (tmp) - 1] = 0;
if (prefix) {
strfcpy (tmp, NONULL (Prefix), sizeof (tmp));
tmp[sizeof (tmp) - 1] = 0;
if (prefix) {
strfcpy (tmp, NONULL (Prefix), sizeof (tmp));
- tmplen =
safe
_strlen (tmp);
+ tmplen =
mutt
_strlen (tmp);
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
}
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
}
@@
-72,7
+72,7
@@
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
while (bytes > 0) {
if (fgets (p, tmplen - 1, f) == NULL)
break;
while (bytes > 0) {
if (fgets (p, tmplen - 1, f) == NULL)
break;
- bytes -=
safe
_strlen (p);
+ bytes -=
mutt
_strlen (p);
if (*bufmax == *buflen)
safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
buf[(*buflen)++] = safe_strdup (tmp);
if (*bufmax == *buflen)
safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
buf[(*buflen)++] = safe_strdup (tmp);
@@
-316,7
+316,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
if (EscChar && tmp[0] == EscChar[0] && tmp[1] != EscChar[0]) {
/* remove trailing whitespace from the line */
if (EscChar && tmp[0] == EscChar[0] && tmp[1] != EscChar[0]) {
/* remove trailing whitespace from the line */
- p = tmp +
safe
_strlen (tmp) - 1;
+ p = tmp +
mutt
_strlen (tmp) - 1;
while (p >= tmp && ISSPACE (*p))
*p-- = 0;
while (p >= tmp && ISSPACE (*p))
*p-- = 0;
@@
-345,9
+345,9
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
if (Context) {
if (!*p && cur) {
/* include the current message */
if (Context) {
if (!*p && cur) {
/* include the current message */
- p = tmp +
safe
_strlen (tmp) + 1;
- snprintf (tmp +
safe
_strlen (tmp),
- sizeof (tmp) -
safe
_strlen (tmp), " %d",
+ p = tmp +
mutt
_strlen (tmp) + 1;
+ snprintf (tmp +
mutt
_strlen (tmp),
+ sizeof (tmp) -
mutt
_strlen (tmp), " %d",
cur->msgno + 1);
}
buf = be_include_messages (p, buf, &bufmax, &buflen,
cur->msgno + 1);
}
buf = be_include_messages (p, buf, &bufmax, &buflen,
@@
-389,7
+389,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
if (buflen) {
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
if (buflen) {
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
- tmp[
safe
_strlen (tmp) - 1] = 0;
+ tmp[
mutt
_strlen (tmp) - 1] = 0;
FREE (&buf[buflen]);
buf[buflen] = NULL;
continue;
FREE (&buf[buflen]);
buf[buflen] = NULL;
continue;
@@
-433,7
+433,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
break;
}
}
break;
}
}
- else if (
safe
_strcmp (".", tmp) == 0)
+ else if (
mutt
_strcmp (".", tmp) == 0)
done = 1;
else {
safe_strcat (tmp, sizeof (tmp), "\n");
done = 1;
else {
safe_strcat (tmp, sizeof (tmp), "\n");