X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=parse.c;h=a09d8dd522c0b3afe8831dcb505244c15bf69440;hb=68d3f8c8e978c7acfcd115d9a3e895cf0fc4f71e;hp=7bb0699f91afa7980d7044305607bec01618dfd3;hpb=c3e57678c8be193fc137854020f3a90887be97c9;p=apps%2Fmadmutt.git diff --git a/parse.c b/parse.c index 7bb0699..a09d8dd 100644 --- a/parse.c +++ b/parse.c @@ -20,6 +20,10 @@ #include "mutt_crypt.h" #include "url.h" +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/str.h" + #include #include #include @@ -42,7 +46,7 @@ static char *read_rfc822_line (FILE * f, char *line, size_t * linelen) return (line); } - buf += strlen (buf) - 1; + buf += mutt_strlen (buf) - 1; if (*buf == '\n') { /* we did get a full line. remove trailing space */ while (ISSPACE (*buf)) @@ -91,7 +95,7 @@ LIST *mutt_parse_references (char *s, int in_reply_to) new = NULL; if (*s == '<') { - n = strlen (s); + n = mutt_strlen (s); if (s[n - 1] != '>') { o = s; s = NULL; @@ -101,7 +105,7 @@ LIST *mutt_parse_references (char *s, int in_reply_to) new = safe_strdup (s); } else if (o) { - m = strlen (s); + m = mutt_strlen (s); if (s[m - 1] == '>') { new = safe_malloc (sizeof (char) * (n + m + 1)); strcpy (new, o); /* __STRCPY_CHECKED__ */ @@ -1253,7 +1257,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p, /* Keep track of the user-defined headers */ if (!matched && user_hdrs) { /* restore the original line */ - line[strlen (line)] = ':'; + line[mutt_strlen (line)] = ':'; if (weed && option (OPTWEED) && mutt_matches_ignore (line, Ignore) && !mutt_matches_ignore (line, UnIgnore))