X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=parse.c;h=5f737b74fa649e737ddee32e3b51e081c091c7db;hb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;hp=fe0a40d698fba2ca384ba945afb90cda508dcba5;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd;p=apps%2Fmadmutt.git

diff --git a/parse.c b/parse.c
index fe0a40d..5f737b7 100644
--- a/parse.c
+++ b/parse.c
@@ -13,12 +13,12 @@
 
 #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 "mutt.h"
-#include "buffer.h"
 #include "enter.h"
-#include "ascii.h"
 #include "recvattach.h"
 #include "mx.h"
 #include "mime.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;
@@ -596,7 +596,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 +612,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 */
       }
@@ -805,7 +805,7 @@ time_t mutt_parse_date (const char *s, HEADER * h)
     t = scratch;
   SKIPWS (t);
 
-  memset (&tm, 0, sizeof (tm));
+  p_clear(&tm, 1);
 
   while ((t = strtok (t, " \t")) != NULL) {
     switch (count) {
@@ -1040,7 +1040,7 @@ 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));
@@ -1123,7 +1123,7 @@ 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));
@@ -1134,8 +1134,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 +1232,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 +1329,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! */
@@ -1491,7 +1491,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. */