projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
edit.c
diff --git
a/edit.c
b/edit.c
index
c11cad8
..
d9a667a
100644
(file)
--- a/
edit.c
+++ b/
edit.c
@@
-14,6
+14,8
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "ascii.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
@@
-74,11
+76,11
@@
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
break;
bytes -= str_len (p);
if (*bufmax == *buflen)
break;
bytes -= str_len (p);
if (*bufmax == *buflen)
-
safe
_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+
mem
_realloc (&buf, sizeof (char *) * (*bufmax += 25));
buf[(*buflen)++] = str_dup (tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
buf[(*buflen)++] = str_dup (tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
-
safe
_realloc (&buf, sizeof (char *) * (++*bufmax));
+
mem
_realloc (&buf, sizeof (char *) * (++*bufmax));
}
if (buf)
buf[*buflen] = NULL;
}
if (buf)
buf[*buflen] = NULL;
@@
-130,9
+132,9
@@
static int be_barf_file (const char *path, char **buf, int buflen)
static void be_free_memory (char **buf, int buflen)
{
while (buflen-- > 0)
static void be_free_memory (char **buf, int buflen)
{
while (buflen-- > 0)
-
FREE
(&buf[buflen]);
+
mem_free
(&buf[buflen]);
if (buf)
if (buf)
-
FREE
(&buf);
+
mem_free
(&buf);
}
static char **be_include_messages (char *msg, char **buf, int *bufmax,
}
static char **be_include_messages (char *msg, char **buf, int *bufmax,
@@
-154,7
+156,7
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
}
if (*bufmax == *buflen)
}
if (*bufmax == *buflen)
-
safe
_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+
mem
_realloc (&buf, sizeof (char *) * (*bufmax += 25));
buf[(*buflen)++] = str_dup (tmp);
bytes = Context->hdrs[n]->content->length;
buf[(*buflen)++] = str_dup (tmp);
bytes = Context->hdrs[n]->content->length;
@@
-168,7
+170,7
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
pfx);
if (*bufmax == *buflen)
pfx);
if (*bufmax == *buflen)
-
safe
_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+
mem
_realloc (&buf, sizeof (char *) * (*bufmax += 25));
buf[(*buflen)++] = str_dup ("\n");
}
else
buf[(*buflen)++] = str_dup ("\n");
}
else
@@
-390,7
+392,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
tmp[str_len (tmp) - 1] = 0;
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
tmp[str_len (tmp) - 1] = 0;
-
FREE
(&buf[buflen]);
+
mem_free
(&buf[buflen]);
buf[buflen] = NULL;
continue;
}
buf[buflen] = NULL;
continue;
}
@@
-438,7
+440,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
else {
str_cat (tmp, sizeof (tmp), "\n");
if (buflen == bufmax)
else {
str_cat (tmp, sizeof (tmp), "\n");
if (buflen == bufmax)
-
safe
_realloc (&buf, sizeof (char *) * (bufmax += 25));
+
mem
_realloc (&buf, sizeof (char *) * (bufmax += 25));
buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp);
}
buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp);
}