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
42a3bcf
..
d4bcc68
100644
(file)
--- a/
edit.c
+++ b/
edit.c
@@
-14,15
+14,16
@@
#endif
#include <lib-lib/mem.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 "ascii.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
@@
-65,8
+66,8
@@
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 =
str_len
(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;
}
@@
-75,10
+76,10
@@
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 -=
str_len
(p);
+ bytes -=
m_strlen
(p);
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
- buf[(*buflen)++] =
str_dup
(tmp);
+ buf[(*buflen)++] =
m_strdup
(tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
p_realloc(&buf, ++*bufmax);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
p_realloc(&buf, ++*bufmax);
@@
-158,7
+159,7
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
- buf[(*buflen)++] =
str_dup
(tmp);
+ buf[(*buflen)++] =
m_strdup
(tmp);
bytes = Context->hdrs[n]->content->length;
if (inc_hdrs) {
bytes = Context->hdrs[n]->content->length;
if (inc_hdrs) {
@@
-172,7
+173,7
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
- buf[(*buflen)++] =
str_dup
("\n");
+ buf[(*buflen)++] =
m_strdup
("\n");
}
else
printw (_("%d: invalid message number.\n"), n);
}
else
printw (_("%d: invalid message number.\n"), n);
@@
-246,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');
@@
-319,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 +
str_len
(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 '?':
@@
-348,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 +
str_len
(tmp) + 1;
- snprintf (tmp +
str_len
(tmp),
- sizeof (tmp) -
str_len
(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,
@@
-374,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);
}
@@
-391,8
+391,8
@@
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[
str_len
(tmp) - 1] = 0;
+
m_strcpy(tmp, sizeof(tmp), buf[buflen]
);
+ tmp[
m_strlen
(tmp) - 1] = 0;
p_delete(&buf[buflen]);
buf[buflen] = NULL;
continue;
p_delete(&buf[buflen]);
buf[buflen] = NULL;
continue;
@@
-436,13
+436,13
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
break;
}
}
break;
}
}
- else if (
str_cmp
(".", tmp) == 0)
+ else if (
m_strcmp
(".", tmp) == 0)
done = 1;
else {
done = 1;
else {
-
str_cat (tmp, sizeof
(tmp), "\n");
+
m_strcat(tmp, sizeof
(tmp), "\n");
if (buflen == bufmax)
p_realloc(&buf, bufmax += 25);
if (buflen == bufmax)
p_realloc(&buf, bufmax += 25);
- buf[buflen++] =
str_dup
(tmp[1] == '~' ? tmp + 1 : tmp);
+ buf[buflen++] =
m_strdup
(tmp[1] == '~' ? tmp + 1 : tmp);
}
tmp[0] = 0;
}
tmp[0] = 0;