return (line);
}
- buf += safe_strlen (buf) - 1;
+ buf += mutt_strlen (buf) - 1;
if (*buf == '\n') {
/* we did get a full line. remove trailing space */
while (ISSPACE (*buf))
new = NULL;
if (*s == '<') {
- n = safe_strlen (s);
+ n = mutt_strlen (s);
if (s[n - 1] != '>') {
o = s;
s = NULL;
new = safe_strdup (s);
}
else if (o) {
- m = safe_strlen (s);
+ m = mutt_strlen (s);
if (s[m - 1] == '>') {
new = safe_malloc (sizeof (char) * (n + m + 1));
strcpy (new, o); /* __STRCPY_CHECKED__ */
return (NULL);
}
- blen = safe_strlen (boundary);
+ blen = mutt_strlen (boundary);
while (ftell (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL) {
- len = safe_strlen (buffer);
+ len = mutt_strlen (buffer);
crlf = (len > 1 && buffer[len - 2] == '\r') ? 1 : 0;
buffer[i] = 0;
/* Check for the end boundary */
- if (safe_strcmp (buffer + blen + 2, "--") == 0) {
+ if (mutt_strcmp (buffer + blen + 2, "--") == 0) {
final = 1;
break; /* done parsing */
}
#ifdef USE_NNTP
else if (!safe_strcasecmp (line + 1, "ollowup-to")) {
if (!e->followup_to) {
- mutt_remove_trailing_ws (p);
- e->followup_to = safe_strdup (mutt_skip_whitespace (p));
+ str_skip_trailws (p);
+ e->followup_to = safe_strdup (str_skip_initws (p));
}
matched = 1;
}
case 'n':
if (!safe_strcasecmp (line + 1, "ewsgroups")) {
FREE (&e->newsgroups);
- mutt_remove_trailing_ws (p);
- e->newsgroups = safe_strdup (mutt_skip_whitespace (p));
+ str_skip_trailws (p);
+ e->newsgroups = safe_strdup (str_skip_initws (p));
matched = 1;
}
break;
/* Keep track of the user-defined headers */
if (!matched && user_hdrs) {
/* restore the original line */
- line[safe_strlen (line)] = ':';
+ line[mutt_strlen (line)] = ':';
if (weed && option (OPTWEED) && mutt_matches_ignore (line, Ignore)
&& !mutt_matches_ignore (line, UnIgnore))