X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=8175f6f396739b44762684c9e8c00692bf8c0ce5;hp=70379fa759e04c7dde9ededa9799f9d1c7ff35dc;hb=344312314eec327c3bf47f86950a5ad6c616e031;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420 diff --git a/parse.c b/parse.c index 70379fa..8175f6f 100644 --- a/parse.c +++ b/parse.c @@ -15,15 +15,15 @@ #include #include #include +#include + +#include #include "mutt.h" -#include "buffer.h" #include "enter.h" #include "recvattach.h" #include "mx.h" -#include "mime.h" #include "rfc2047.h" -#include "rfc2231.h" #include "mutt_crypt.h" #include "url.h" @@ -45,7 +45,7 @@ char *mutt_read_rfc822_line (FILE * f, char *line, size_t * linelen) 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; @@ -194,8 +194,7 @@ static PARAMETER *parse_parameters (const char *s) 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; @@ -257,10 +256,8 @@ static PARAMETER *parse_parameters (const char *s) break; /* no more parameters */ do { - s++; - /* Move past any leading whitespace */ - SKIPWS (s); + s = vskipspaces(s + 1); } while (*s == ';'); /* skip empty parameters */ } @@ -396,11 +393,9 @@ static void parse_content_disposition (char *s, BODY * ct) /* 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) + s = vskipspaces(s + 1); + if ((s = mutt_get_parameter("filename", + (parms = parse_parameters (s)))) != 0) str_replace (&ct->filename, s); if ((s = mutt_get_parameter ("name", parms)) != 0) ct->form_name = m_strdup(s); @@ -431,9 +426,8 @@ BODY *mutt_read_mime_header (FILE * fp, int digest) 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; @@ -596,7 +590,7 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off, 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) @@ -612,7 +606,7 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off, 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 */ } @@ -668,8 +662,7 @@ static const char *uncomment_timezone (char *buf, size_t buflen, 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; @@ -796,14 +789,14 @@ time_t mutt_parse_date (const char *s, HEADER * h) * 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); p_clear(&tm, 1); @@ -1040,10 +1033,10 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *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; } @@ -1123,10 +1116,10 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p, #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; @@ -1134,8 +1127,8 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p, 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; @@ -1232,12 +1225,12 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p, 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; @@ -1329,7 +1322,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs, 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! */ @@ -1378,9 +1371,8 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs, } } - *p = 0; - p++; - SKIPWS (p); + *p++ = 0; + p = vskipspaces(p); if (!*p) continue; /* skip empty header fields */ @@ -1415,7 +1407,7 @@ ADDRESS *mutt_parse_adrlist (ADDRESS * p, const char *s) 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); @@ -1491,7 +1483,7 @@ int count_body_parts (BODY *body, int flags) { } 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. */