#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
+
+#include <lib-mime/mime.h>
#include "mutt.h"
-#include "buffer.h"
#include "enter.h"
-#include "ascii.h"
#include "recvattach.h"
#include "mx.h"
-#include "mime.h"
-#include "rfc2047.h"
-#include "rfc2231.h"
#include "mutt_crypt.h"
#include "url.h"
char ch;
size_t offset = 0;
- FOREVER {
+ for (;;) {
if (fgets (buf, *linelen - offset, f) == NULL || /* end of file or */
(ISSPACE (*line) && !offset)) { /* end of headers */
*line = 0;
while (ISSPACE (new->attribute[--i]))
new->attribute[i] = 0;
- s = p + 1; /* skip over the = */
- SKIPWS (s);
+ s = vskipspaces(p + 1); /* skip over the = */
if (*s == '"') {
int state_ascii = 1;
break; /* no more parameters */
do {
- s++;
-
/* Move past any leading whitespace */
- SKIPWS (s);
+ s = vskipspaces(s + 1);
}
while (*s == ';'); /* skip empty parameters */
}
/* Check to see if a default filename was given */
if ((s = strchr (s, ';')) != NULL) {
- s++;
- SKIPWS (s);
- if ((s =
- mutt_get_parameter ("filename",
- (parms = parse_parameters (s)))) != 0)
- str_replace (&ct->filename, s);
+ s = vskipspaces(s + 1);
+ if ((s = mutt_get_parameter("filename",
+ (parms = parse_parameters (s)))) != 0)
+ m_strreplace(&ct->filename, s);
if ((s = mutt_get_parameter ("name", parms)) != 0)
ct->form_name = m_strdup(s);
mutt_free_parameter (&parms);
while (*(line = mutt_read_rfc822_line (fp, line, &linelen)) != 0) {
/* Find the value of the current header */
if ((c = strchr (line, ':'))) {
- *c = 0;
- c++;
- SKIPWS (c);
+ *c++ = 0;
+ c = vskipspaces(c);
if (!*c) {
debug_print (1, ("skipping empty header field: %s\n", line));
continue;
else if (!ascii_strcasecmp ("disposition", line + 8))
parse_content_disposition (c, p);
else if (!ascii_strcasecmp ("description", line + 8)) {
- str_replace (&p->description, c);
+ m_strreplace(&p->description, c);
rfc2047_decode (&p->description);
}
}
else if (!ascii_strcasecmp ("content-lines", line + 6))
mutt_set_parameter ("content-lines", c, &(p->parameter));
else if (!ascii_strcasecmp ("data-description", line + 6)) {
- str_replace (&p->description, c);
+ m_strreplace(&p->description, c);
rfc2047_decode (&p->description);
}
}
/* try to recover from parsing error */
if (!b->parts) {
b->type = TYPETEXT;
- str_replace (&b->subtype, "plain");
+ m_strreplace(&b->subtype, "plain");
}
}
crlf = (len > 1 && buffer[len - 2] == '\r') ? 1 : 0;
if (buffer[0] == '-' && buffer[1] == '-' &&
- str_ncmp (buffer + 2, boundary, blen) == 0) {
+ m_strncmp(buffer + 2, boundary, blen) == 0) {
if (last) {
last->length = ftello (fp) - last->offset - len - 1 - crlf;
if (last->parts && last->parts->length == 0)
buffer[i] = 0;
/* Check for the end boundary */
- if (str_cmp (buffer + blen + 2, "--") == 0) {
+ if (m_strcmp(buffer + blen + 2, "--") == 0) {
final = 1;
break; /* done parsing */
}
if (*tz != '(')
return tz; /* no need to do anything */
- tz++;
- SKIPWS (tz);
+ tz = vskipspaces(tz + 1);
if ((p = strpbrk (tz, " )")) == NULL)
return tz;
len = p - tz;
* the date format imposes a natural limit.
*/
- strfcpy (scratch, s, sizeof (scratch));
+ m_strcpy(scratch, sizeof(scratch), s);
/* kill the day of the week, if it exists. */
if ((t = strchr (scratch, ',')))
t++;
else
t = scratch;
- SKIPWS (t);
+ t = vskipspaces(t);
- memset (&tm, 0, sizeof (tm));
+ p_clear(&tm, 1);
while ((t = strtok (t, " \t")) != NULL) {
switch (count) {
}
else if (ascii_strcasecmp (line + 8, "description") == 0) {
if (hdr) {
- str_replace (&hdr->content->description, p);
+ m_strreplace(&hdr->content->description, p);
rfc2047_decode (&hdr->content->description);
}
matched = 1;
case 'd':
if (!ascii_strcasecmp ("ate", line + 1)) {
- str_replace (&e->date, p);
+ m_strreplace(&e->date, p);
if (hdr)
hdr->date_sent = mutt_parse_date (p, hdr);
matched = 1;
* and mark mail/(esp.) news article as your own. aaargh! this
* bothered me for _years_ */
if (!e->from) {
- e->from = rfc822_new_address ();
+ e->from = address_new ();
e->from->personal = m_strdup(p);
}
matched = 1;
}
#ifdef USE_NNTP
- else if (!str_casecmp (line + 1, "ollowup-to")) {
+ else if (!m_strcasecmp(line + 1, "ollowup-to")) {
if (!e->followup_to) {
str_skip_trailws (p);
- e->followup_to = m_strdup(str_skip_initws (p));
+ e->followup_to = m_strdup(vskipspaces(p));
}
matched = 1;
}
else if (!ascii_strncasecmp (line + 1, "ail-", 4)) {
if (!ascii_strcasecmp (line + 5, "reply-to")) {
/* override the Reply-To: field */
- rfc822_free_address (&e->reply_to);
+ address_delete (&e->reply_to);
e->reply_to = rfc822_parse_adrlist (e->reply_to, p);
matched = 1;
}
#ifdef USE_NNTP
case 'n':
- if (!str_casecmp (line + 1, "ewsgroups")) {
+ if (!m_strcasecmp(line + 1, "ewsgroups")) {
p_delete(&e->newsgroups);
str_skip_trailws (p);
- e->newsgroups = m_strdup(str_skip_initws (p));
+ e->newsgroups = m_strdup(vskipspaces(p));
matched = 1;
}
break;
case 'o':
/* field `Organization:' saves only for pager! */
- if (!str_casecmp (line + 1, "rganization")) {
- if (!e->organization && str_casecmp (p, "unknown"))
+ if (!m_strcasecmp(line + 1, "rganization")) {
+ if (!e->organization && m_strcasecmp(p, "unknown"))
e->organization = m_strdup(p);
}
break;
matched = 1;
}
#ifdef USE_NNTP
- else if (!str_casecmp (line + 1, "-comment-to")) {
+ else if (!m_strcasecmp(line + 1, "-comment-to")) {
if (!e->x_comment_to)
e->x_comment_to = m_strdup(p);
matched = 1;
}
- else if (!str_casecmp (line + 1, "ref")) {
+ else if (!m_strcasecmp(line + 1, "ref")) {
if (!e->xref)
e->xref = m_strdup(p);
matched = 1;
time_t t;
/* some bogus MTAs will quote the original "From " line */
- if (str_ncmp (">From ", line, 6) == 0)
+ if (m_strncmp(">From ", line, 6) == 0)
continue; /* just ignore */
else if (is_from (line, return_path, sizeof (return_path), &t)) {
/* MH somtimes has the From_ line in the middle of the header! */
}
}
- *p = 0;
- p++;
- SKIPWS (p);
+ *p++ = 0;
+ p = vskipspaces(p);
if (!*p)
continue; /* skip empty header fields */
return (e);
}
-ADDRESS *mutt_parse_adrlist (ADDRESS * p, const char *s)
+address_t *mutt_parse_adrlist (address_t * p, const char *s)
{
const char *q;
char tmp[HUGE_STRING];
char *r;
- strfcpy (tmp, s, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), s);
r = tmp;
while ((r = strtok (r, " \t")) != NULL) {
p = rfc822_parse_adrlist (p, r);
} else if (bp->type == TYPEMULTIPART) {
/* Always recurse multiparts, except multipart/alternative. */
shallrecurse = 1;
- if (!str_casecmp(bp->subtype, "alternative"))
+ if (!m_strcasecmp(bp->subtype, "alternative"))
shallrecurse = 0;
/* Don't count containers if they're top-level. */
projects / apps / madmutt.git / blobdiff