projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the C gods blessed us with a preprocessor, use it.
[apps/madmutt.git]
/
edit.c
diff --git
a/edit.c
b/edit.c
index
b9ffe18
..
d4bcc68
100644
(file)
--- a/
edit.c
+++ b/
edit.c
@@
-13,13
+13,17
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
#include "mutt.h"
#include "mutt.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
@@
-33,7
+37,7
@@
* SLcurses_waddnstr() can't take a "const char *", so this is only
* declared "static" (sigh)
*/
* SLcurses_waddnstr() can't take a "const char *", so this is only
* declared "static" (sigh)
*/
-static char *EditorHelp = N_("\
+static c
onst c
har *EditorHelp = N_("\
~~ insert a line begining with a single ~\n\
~b users add users to the Bcc: field\n\
~c users add users to the Cc: field\n\
~~ insert a line begining with a single ~\n\
~b users add users to the Bcc: field\n\
~c users add users to the Cc: field\n\
@@
-54,7
+58,7
@@
static char *EditorHelp = N_("\
. on a line by itself ends input\n");
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
. on a line by itself ends input\n");
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
-
in
t offset, int bytes, int prefix)
+
off_
t offset, int bytes, int prefix)
{
char tmp[HUGE_STRING];
char *p = tmp;
{
char tmp[HUGE_STRING];
char *p = tmp;
@@
-62,23
+66,23
@@
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
));
- tmplen =
safe_strlen
(tmp);
+
m_strcpy(tmp, sizeof(tmp), NONULL(Prefix
));
+ tmplen =
m_strlen
(tmp);
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
}
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
}
- fseek (f, offset, 0);
+ fseek
o
(f, offset, 0);
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 -=
m_strlen
(p);
if (*bufmax == *buflen)
if (*bufmax == *buflen)
-
safe_realloc (&buf, sizeof (char *) * (*bufmax += 25)
);
- buf[(*buflen)++] =
safe_strdup
(tmp);
+
p_realloc(&buf, *bufmax += 25
);
+ buf[(*buflen)++] =
m_strdup
(tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
-
safe_realloc (&buf, sizeof (char *) * (++*bufmax)
);
+
p_realloc(&buf, ++*bufmax
);
}
if (buf)
buf[*buflen] = NULL;
}
if (buf)
buf[*buflen] = NULL;
@@
-130,9
+134,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]);
+
p_delete
(&buf[buflen]);
if (buf)
if (buf)
-
FREE
(&buf);
+
p_delete
(&buf);
}
static char **be_include_messages (char *msg, char **buf, int *bufmax,
}
static char **be_include_messages (char *msg, char **buf, int *bufmax,
@@
-154,8
+158,8
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
}
if (*bufmax == *buflen)
}
if (*bufmax == *buflen)
-
safe_realloc (&buf, sizeof (char *) * (*bufmax += 25)
);
- buf[(*buflen)++] =
safe_strdup
(tmp);
+
p_realloc(&buf, *bufmax += 25
);
+ buf[(*buflen)++] =
m_strdup
(tmp);
bytes = Context->hdrs[n]->content->length;
if (inc_hdrs) {
bytes = Context->hdrs[n]->content->length;
if (inc_hdrs) {
@@
-168,8
+172,8
@@
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)
);
- buf[(*buflen)++] =
safe_strdup
("\n");
+
p_realloc(&buf, *bufmax += 25
);
+ buf[(*buflen)++] =
m_strdup
("\n");
}
else
printw (_("%d: invalid message number.\n"), n);
}
else
printw (_("%d: invalid message number.\n"), n);
@@
-243,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');
@@
-316,12
+320,11
@@
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 +
m_strlen
(tmp) - 1;
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 '?':
@@
-345,9
+348,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 +
m_strlen
(tmp) + 1;
+ snprintf (tmp +
m_strlen
(tmp),
+ sizeof (tmp) -
m_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,
@@
-371,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);
}
@@
-388,9
+391,9
@@
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)
);
- tmp[
safe_strlen
(tmp) - 1] = 0;
-
FREE
(&buf[buflen]);
+
m_strcpy(tmp, sizeof(tmp), buf[buflen]
);
+ tmp[
m_strlen
(tmp) - 1] = 0;
+
p_delete
(&buf[buflen]);
buf[buflen] = NULL;
continue;
}
buf[buflen] = NULL;
continue;
}
@@
-401,7
+404,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
case 'e':
case 'v':
if (be_barf_file (path, buf, buflen) == 0) {
case 'e':
case 'v':
if (be_barf_file (path, buf, buflen) == 0) {
- char *tag, *err;
+ c
onst c
har *tag, *err;
be_free_memory (buf, buflen);
buf = NULL;
be_free_memory (buf, buflen);
buf = NULL;
@@
-433,13
+436,13
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
break;
}
}
break;
}
}
- else if (
safe_strcmp
(".", tmp) == 0)
+ else if (
m_strcmp
(".", tmp) == 0)
done = 1;
else {
done = 1;
else {
-
safe_strcat (tmp, sizeof
(tmp), "\n");
+
m_strcat(tmp, sizeof
(tmp), "\n");
if (buflen == bufmax)
if (buflen == bufmax)
-
safe_realloc (&buf, sizeof (char *) * (bufmax += 25)
);
- buf[buflen++] =
safe_strdup
(tmp[1] == '~' ? tmp + 1 : tmp);
+
p_realloc(&buf, bufmax += 25
);
+ buf[buflen++] =
m_strdup
(tmp[1] == '~' ? tmp + 1 : tmp);
}
tmp[0] = 0;
}
tmp[0] = 0;