move more things in the lib-mime

[apps/madmutt.git] / lib-mime / rfc822parse.c

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 40414d9..33012fd 100644 (file)
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -38,12 +38,11 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
 #include <lib-lib/date.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
 #include <lib-lib/date.h>

+#include <lib-lib/url.h>

 
 #include "recvattach.h"
 
 #include "recvattach.h"

-#include "url.h"
-
-#include "lib/debug.h"

 
 

+#include "charset.h"

 #include "mime.h"
 
 /* Reads an arbitrarily long header field, and looks ahead for continuation
 #include "mime.h"
 
 /* Reads an arbitrarily long header field, and looks ahead for continuation


@@ -100,9 +99,9 @@ ssize_t mutt_read_rfc822_line(FILE *f, char **line, ssize_t *n)
 }
 
 /* TODO: Make that a string list somehow */
 }
 
 /* TODO: Make that a string list somehow */

-LIST *mutt_parse_references(char *s, int in_reply_to)
+string_list_t *mutt_parse_references(char *s, int in_reply_to)

 {
 {

-    LIST *lst = NULL;
+    string_list_t *lst = NULL;

     int n = 0;
     char *o = NULL;
 
     int n = 0;
     char *o = NULL;
 


@@ -143,14 +142,14 @@ LIST *mutt_parse_references(char *s, int in_reply_to)
          */
         if (new) {
             char *at = strchr(new, '@');
          */
         if (new) {
             char *at = strchr(new, '@');

-            LIST *tmp;
+            string_list_t *tmp;

 
             if (!at || strchr(at + 1, '@') || (in_reply_to && at - new <= 8)) {
                 p_delete(&new);
                 continue;
             }
 
 
             if (!at || strchr(at + 1, '@') || (in_reply_to && at - new <= 8)) {
                 p_delete(&new);
                 continue;
             }
 

-            tmp = p_new(LIST, 1);
+            tmp = p_new(string_list_t, 1);

             tmp->data = new;
             tmp->next = lst;
             lst = tmp;
             tmp->data = new;
             tmp->next = lst;
             lst = tmp;


@@ -202,14 +201,14 @@ int mutt_check_mime_type(const char *s)
     }
 }
 
     }
 }
 

-static PARAMETER *parse_parameters(const char *s)
+static parameter_t *parse_parameters(const char *s)

 {
 {

-    PARAMETER *res = NULL;
-    PARAMETER **list = &res;
+    parameter_t *res = NULL;
+    parameter_t **list = &res;

 
     while (*s) {
         const char *p;
 
     while (*s) {
         const char *p;

-        PARAMETER *new;
+        parameter_t *new;

         int i;
 
         s = skipspaces(s);
         int i;
 
         s = skipspaces(s);


@@ -282,7 +281,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
     char *subtype;
 
     p_delete(&ct->subtype);
     char *subtype;
 
     p_delete(&ct->subtype);

-    parameter_delete(&ct->parameter);
+    parameter_list_wipe(&ct->parameter);

 
     /* First extract any existing parameters */
     if ((pc = strchr(s, ';')) != NULL) {
 
     /* First extract any existing parameters */
     if ((pc = strchr(s, ';')) != NULL) {


@@ -292,7 +291,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
         /* Some pre-RFC1521 gateways still use the "name=filename" convention,
          * but if a filename has already been set in the content-disposition,
          * let that take precedence, and don't set it here */
         /* Some pre-RFC1521 gateways still use the "name=filename" convention,
          * but if a filename has already been set in the content-disposition,
          * let that take precedence, and don't set it here */

-        pc = mutt_get_parameter("name", ct->parameter);
+        pc = parameter_getval(ct->parameter, "name");

         if (pc && !ct->filename)
             ct->filename = m_strdup(pc);
     }
         if (pc && !ct->filename)
             ct->filename = m_strdup(pc);
     }


@@ -344,17 +343,17 @@ void mutt_parse_content_type(char *s, BODY *ct)
 
     /* Default character set for text types. */
     if (ct->type == TYPETEXT) {
 
     /* Default character set for text types. */
     if (ct->type == TYPETEXT) {

-        pc = mutt_get_parameter("charset", ct->parameter);
+        pc = parameter_getval(ct->parameter, "charset");

         if (!pc) {
         if (!pc) {

-            mutt_set_parameter("charset",
-                               option(OPTSTRICTMIME) ? "us-ascii" :
-                               mutt_get_first_charset(AssumedCharset),
-                               &ct->parameter);
+            parameter_setval(&ct->parameter, "charset",
+                             option(OPTSTRICTMIME)
+                             ? "us-ascii"
+                             : charset_getfirst(AssumedCharset));

         }
     }
 }
 
         }
     }
 }
 

-static void parse_content_disposition(char *s, BODY *ct)
+static void parse_content_disposition(const char *s, BODY *ct)

 {
     if (!ascii_strncasecmp(s, "inline", 6)) {
         ct->disposition = DISPINLINE;
 {
     if (!ascii_strncasecmp(s, "inline", 6)) {
         ct->disposition = DISPINLINE;


@@ -366,14 +365,14 @@ static void parse_content_disposition(char *s, BODY *ct)
 
     /* Check to see if a default filename was given */
     if ((s = strchr (s, ';'))) {
 
     /* Check to see if a default filename was given */
     if ((s = strchr (s, ';'))) {

-        PARAMETER *parms = parse_parameters(vskipspaces(s));
+        parameter_t *parms = parse_parameters(vskipspaces(s));

 
 

-        if ((s = mutt_get_parameter("filename", parms)))
+        if ((s = parameter_getval(parms, "filename")))

             m_strreplace(&ct->filename, s);
             m_strreplace(&ct->filename, s);

-        if ((s = mutt_get_parameter ("name", parms)))
+        if ((s = parameter_getval(parms, "name")))

             ct->form_name = m_strdup(s);
 
             ct->form_name = m_strdup(s);
 

-        parameter_delete(&parms);
+        parameter_list_wipe(&parms);

     }
 }
 
     }
 }
 


@@ -385,7 +384,7 @@ static void parse_content_disposition(char *s, BODY *ct)
  */
 BODY *mutt_read_mime_header(FILE *fp, int digest)
 {
  */
 BODY *mutt_read_mime_header(FILE *fp, int digest)
 {

-    BODY *body = mutt_new_body ();
+    BODY *body = body_new();

     char *line = p_new(char, LONG_STRING);
     ssize_t linelen = LONG_STRING;
     char *p;
     char *line = p_new(char, LONG_STRING);
     ssize_t linelen = LONG_STRING;
     char *p;


@@ -403,7 +402,6 @@ BODY *mutt_read_mime_header(FILE *fp, int digest)
             if (!*p)
                 continue;
         } else {
             if (!*p)
                 continue;
         } else {

-            debug_print (1, ("bogus MIME header: %s\n", line));

             break;
         }
 
             break;
         }
 


@@ -447,7 +445,7 @@ void mutt_parse_part(FILE *fp, BODY *b)
 
     switch (b->type) {
       case TYPEMULTIPART:
 
     switch (b->type) {
       case TYPEMULTIPART:

-        bound = mutt_get_parameter("boundary", b->parameter);
+        bound = parameter_getval(b->parameter, "boundary");

         fseeko(fp, b->offset, SEEK_SET);
         b->parts = mutt_parse_multipart(fp, bound, b->offset + b->length,
                                         mime_which_token(b->subtype, -1) == MIME_DIGEST);
         fseeko(fp, b->offset, SEEK_SET);
         b->parts = mutt_parse_multipart(fp, bound, b->offset + b->length,
                                         mime_which_token(b->subtype, -1) == MIME_DIGEST);


@@ -575,7 +573,7 @@ mutt_parse_multipart(FILE *fp, const char *bound, off_t end_off, int digest)
                  */
 
                 if (new->offset > end_off) {
                  */
 
                 if (new->offset > end_off) {

-                    mutt_free_body(&new);
+                    body_list_wipe(&new);

                     break;
                 }
 
                     break;
                 }
 


@@ -617,62 +615,6 @@ uncomment_timezone(char *buf, size_t buflen, const char *tz)
     return buf;
 }
 
     return buf;
 }
 

-static struct tz_t {
-    char tzname[5];
-    unsigned char zhours;
-    unsigned char zminutes;
-    unsigned char zoccident;      /* west of UTC? */
-} TimeZones[] = {
-    {"aat", 1, 0, 1},             /* Atlantic Africa Time */
-    {"adt", 4, 0, 0},             /* Arabia DST */
-    {"ast", 3, 0, 0},             /* Arabia */
-    /*{ "ast",   4,  0, 1 }, *//* Atlantic */
-    {"bst", 1, 0, 0},             /* British DST */
-    {"cat", 1, 0, 0},             /* Central Africa */
-    {"cdt", 5, 0, 1},
-    {"cest", 2, 0, 0},            /* Central Europe DST */
-    {"cet", 1, 0, 0},             /* Central Europe */
-    {"cst", 6, 0, 1},
-    /*{ "cst",   8,  0, 0 }, *//* China */
-    /*{ "cst",   9, 30, 0 }, *//* Australian Central Standard Time */
-    {"eat", 3, 0, 0},             /* East Africa */
-    {"edt", 4, 0, 1},
-    {"eest", 3, 0, 0},            /* Eastern Europe DST */
-    {"eet", 2, 0, 0},             /* Eastern Europe */
-    {"egst", 0, 0, 0},            /* Eastern Greenland DST */
-    {"egt", 1, 0, 1},             /* Eastern Greenland */
-    {"est", 5, 0, 1},
-    {"gmt", 0, 0, 0},
-    {"gst", 4, 0, 0},             /* Presian Gulf */
-    {"hkt", 8, 0, 0},             /* Hong Kong */
-    {"ict", 7, 0, 0},             /* Indochina */
-    {"idt", 3, 0, 0},             /* Israel DST */
-    {"ist", 2, 0, 0},             /* Israel */
-    /*{ "ist",   5, 30, 0 }, *//* India */
-    {"jst", 9, 0, 0},             /* Japan */
-    {"kst", 9, 0, 0},             /* Korea */
-    {"mdt", 6, 0, 1},
-    {"met", 1, 0, 0},             /* this is now officially CET */
-    {"msd", 4, 0, 0},             /* Moscow DST */
-    {"msk", 3, 0, 0},             /* Moscow */
-    {"mst", 7, 0, 1},
-    {"nzdt", 13, 0, 0},           /* New Zealand DST */
-    {"nzst", 12, 0, 0},           /* New Zealand */
-    {"pdt", 7, 0, 1},
-    {"pst", 8, 0, 1},
-    {"sat", 2, 0, 0},             /* South Africa */
-    {"smt", 4, 0, 0},             /* Seychelles */
-    {"sst", 11, 0, 1},            /* Samoa */
-    /*{ "sst",   8,  0, 0 }, *//* Singapore */
-    {"utc", 0, 0, 0},
-    {"wat", 0, 0, 0},             /* West Africa */
-    {"west", 1, 0, 0},            /* Western Europe DST */
-    {"wet", 0, 0, 0},             /* Western Europe */
-    {"wgst", 2, 0, 1},            /* Western Greenland DST */
-    {"wgt", 3, 0, 1},             /* Western Greenland */
-    {"wst", 8, 0, 0},             /* Western Australia */
-};
-

 /* parses a date string in RFC822 format:
  *
  * Date: [ weekday , ] day-of-month month year hour:minute:second timezone
 /* parses a date string in RFC822 format:
  *
  * Date: [ weekday , ] day-of-month month year hour:minute:second timezone


@@ -754,26 +696,6 @@ time_t mutt_parse_date(const char *s, HEADER *h)
                     zhours    = (ptz[1] - '0') * 10 + (ptz[2] - '0');
                     zminutes  = (ptz[3] - '0') * 10 + (ptz[4] - '0');
                 }
                     zhours    = (ptz[1] - '0') * 10 + (ptz[2] - '0');
                     zminutes  = (ptz[3] - '0') * 10 + (ptz[4] - '0');
                 }

-            } else {
-                struct tz_t *tz;
-
-                /* This is safe to do: A pointer to a struct equals a pointer to its
-                 * first element*/
-                tz = bsearch(ptz, TimeZones, countof(TimeZones), sizeof(TimeZones[0]),
-                             (int (*)(const void *, const void *))ascii_strcasecmp);
-
-                if (tz) {
-                    zhours = tz->zhours;
-                    zminutes = tz->zminutes;
-                    zoccident = tz->zoccident;
-                }
-
-                /* ad hoc support for the European MET (now officially CET) TZ */
-                if (ascii_strcasecmp(p, "MET") == 0) {
-                    if ((p = strtok (NULL, " \t")) && !ascii_strcasecmp(p, "DST")) {
-                        zhours++;
-                    }
-                }

             }
             break;
         }
             }
             break;
         }


@@ -782,7 +704,6 @@ time_t mutt_parse_date(const char *s, HEADER *h)
     }
 
     if (count < 4) {  /* don't check for missing timezone */
     }
 
     if (count < 4) {  /* don't check for missing timezone */

-        debug_print (1, ("error parsing date format, using received time\n"));

         return -1;
     }
 
         return -1;
     }
 


@@ -795,8 +716,8 @@ time_t mutt_parse_date(const char *s, HEADER *h)
     return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60);
 }
 
     return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60);
 }
 

-LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
-                              short weed, short do_2047, LIST **user_hdrs)
+string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
+                              short weed, short do_2047, string_list_t **user_hdrs)

 {
     switch (mime_which_token(line, -1)) {
       case MIME_APPARENTLY_FROM:
 {
     switch (mime_which_token(line, -1)) {
       case MIME_APPARENTLY_FROM:


@@ -877,7 +798,7 @@ LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
         break;
 
       case MIME_IN_REPLY_TO:
         break;
 
       case MIME_IN_REPLY_TO:

-        mutt_free_list(&e->in_reply_to);
+        string_list_wipe(&e->in_reply_to);

         e->in_reply_to = mutt_parse_references(p, 1);
         break;
 
         e->in_reply_to = mutt_parse_references(p, 1);
         break;
 


@@ -914,7 +835,7 @@ LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
         break;
 
       case MIME_MAIL_REPLY_TO:
         break;
 
       case MIME_MAIL_REPLY_TO:

-        address_delete (&e->reply_to);
+        address_list_wipe(&e->reply_to);

         e->reply_to = rfc822_parse_adrlist(e->reply_to, p);
         break;
 
         e->reply_to = rfc822_parse_adrlist(e->reply_to, p);
         break;
 


@@ -957,7 +878,7 @@ LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
         break;
 
       case MIME_REFERENCES:
         break;
 
       case MIME_REFERENCES:

-        mutt_free_list(&e->references);
+        string_list_wipe(&e->references);

         e->references = mutt_parse_references(p, 0);
         break;
 
         e->references = mutt_parse_references(p, 0);
         break;
 


@@ -1058,11 +979,10 @@ LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
             break;
         }
 
             break;
         }
 

-        *user_hdrs = mutt_new_list();
+        *user_hdrs = string_item_new();

         (*user_hdrs)->data = m_strdup(line);
         if (do_2047)
             rfc2047_decode(&(*user_hdrs)->data);
         (*user_hdrs)->data = m_strdup(line);
         if (do_2047)
             rfc2047_decode(&(*user_hdrs)->data);

-        (*user_hdrs)->next = mutt_new_list();

         return &(*user_hdrs)->next;
     }
 
         return &(*user_hdrs)->next;
     }
 


@@ -1091,14 +1011,14 @@ ENVELOPE *
 mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
 {
     ENVELOPE *e = envelope_new();
 mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
 {
     ENVELOPE *e = envelope_new();

-    LIST **last = user_hdrs ? &e->userhdrs : NULL;
+    string_list_t **last = user_hdrs ? &e->userhdrs : NULL;

 
     char *line = p_new(char, LONG_STRING);
     ssize_t linelen = LONG_STRING;
     off_t loc;
 
     if (hdr && !hdr->content) {
 
     char *line = p_new(char, LONG_STRING);
     ssize_t linelen = LONG_STRING;
     off_t loc;
 
     if (hdr && !hdr->content) {

-        hdr->content = mutt_new_body ();
+        hdr->content = body_new();

 
         /* set the defaults from RFC1521 */
         hdr->content->type     = TYPETEXT;
 
         /* set the defaults from RFC1521 */
         hdr->content->type     = TYPETEXT;


@@ -1177,8 +1097,6 @@ mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
         rfc2047_decode_envelope(e);
         /* check for missing or invalid date */
         if (hdr->date_sent <= 0) {
         rfc2047_decode_envelope(e);
         /* check for missing or invalid date */
         if (hdr->date_sent <= 0) {

-            debug_print(1, ("no date found, using received "
-                            "time from msg separator\n"));

             hdr->date_sent = hdr->received;
         }
     }
             hdr->date_sent = hdr->received;
         }
     }


@@ -1187,9 +1105,9 @@ mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
 }
 
 /* Compares mime types to the ok and except lists */
 }
 
 /* Compares mime types to the ok and except lists */

-static int count_body_parts_check(LIST **checklist, BODY *b)
+static int count_body_parts_check(string_list_t **checklist, BODY *b)

 {
 {

-    LIST *type;
+    string_list_t *type;

 
     for (type = *checklist; type; type = type->next) {
         ATTACH_MATCH *a = (ATTACH_MATCH *)type->data;
 
     for (type = *checklist; type; type = type->next) {
         ATTACH_MATCH *a = (ATTACH_MATCH *)type->data;


@@ -1203,106 +1121,75 @@ static int count_body_parts_check(LIST **checklist, BODY *b)
     return 0;
 }
 
     return 0;
 }
 

-/* -------------------- XXX: MC READ MARK ------------- */
+static int count_body_parts (BODY *body, int flags)
+{
+    int count = 0;
+    BODY *bp;

 
 

-#define AT_COUNT(why) { shallcount = 1; }
-#define AT_NOCOUNT(why) { shallcount = 0; }
+    if (!body)
+        return 0;

 
 

-int count_body_parts (BODY *body, int flags) {
-  int count = 0;
-  int shallcount, shallrecurse;
-  BODY *bp;
+    for (bp = body; bp != NULL; bp = bp->next) {
+        /* Initial disposition is to count and not to recurse this part. */
+        int shallcount, shallrecurse, iscontainer;
+        int tok = mime_which_token(bp->subtype, -1);

 
 

-  if (body == NULL)
-    return 0;
+        iscontainer  = bp->type == TYPEMESSAGE || bp->type == TYPEMULTIPART;

 
 

-  for (bp = body; bp != NULL; bp = bp->next) {
-    /* Initial disposition is to count and not to recurse this part. */
-    AT_COUNT("default");
-    shallrecurse = 0;
-
-    debug_print(5, ("bp: desc=\"%s\"; fn=\"%s\", type=\"%d/%s\"\n",
-               bp->description ? bp->description : ("none"),
-               bp->filename ? bp->filename :
-               bp->d_filename ? bp->d_filename : "(none)",
-               bp->type, bp->subtype ? bp->subtype : "*"));
-
-    if (bp->type == TYPEMESSAGE) {
-      shallrecurse = 1;
-
-      /* If it's an external body pointer, don't recurse it. */
-      if (mime_which_token(bp->subtype, -1) == MIME_EXTERNAL_BODY)
-        shallrecurse = 0;
-
-      /* Don't count containers if they're top-level. */
-      if (flags & M_PARTS_TOPLEVEL)
-        AT_NOCOUNT("top-level message/*");
-    } else if (bp->type == TYPEMULTIPART) {
-      /* Always recurse multiparts, except multipart/alternative. */
-      shallrecurse = 1;
-      if (mime_which_token(bp->subtype, -1) == MIME_ALTERNATIVE)
-        shallrecurse = 0;
-
-      /* Don't count containers if they're top-level. */
-      if (flags & M_PARTS_TOPLEVEL)
-        AT_NOCOUNT("top-level multipart");
-    }
+        /* don't recurse in external bodies or multipart/alternatives */
+        shallrecurse = (bp->type == TYPEMESSAGE && tok != MIME_EXTERNAL_BODY)
+                    || (bp->type == TYPEMULTIPART && tok != MIME_ALTERNATIVE);

 
 

-    if (bp->disposition == DISPINLINE &&
-        bp->type != TYPEMULTIPART && bp->type != TYPEMESSAGE && bp == body)
-      AT_NOCOUNT("ignore fundamental inlines");
-
-    /* If this body isn't scheduled for enumeration already, don't bother
-     * profiling it further. */
-
-    if (shallcount) {
-      /* Turn off shallcount if message type is not in ok list,
-       * or if it is in except list. Check is done separately for
-       * inlines vs. attachments.
-       */
-
-      if (bp->disposition == DISPATTACH) {
-        if (!count_body_parts_check(&AttachAllow, bp))
-          AT_NOCOUNT("attach not allowed");
-        if (count_body_parts_check(&AttachExclude, bp))
-          AT_NOCOUNT("attach excluded");
-      } else {
-        if (!count_body_parts_check(&InlineAllow, bp))
-          AT_NOCOUNT("inline not allowed");
-        if (count_body_parts_check(&InlineExclude, bp))
-          AT_NOCOUNT("excluded");
-      }
-    }
+        /* Don't count top level containers and fundamental inlines */
+        shallcount   = !(iscontainer && (flags & M_PARTS_TOPLEVEL))
+                    && !(!iscontainer && bp->disposition == DISPINLINE && bp == body);
+
+        if (shallcount) {
+            /* Turn off shallcount if message type is not in ok list,
+             * or if it is in except list. Check is done separately for
+             * inlines vs. attachments.
+             */

 
 

-    if (shallcount)
-      count++;
-    bp->attach_qualifies = shallcount ? 1 : 0;
+            if (bp->disposition == DISPATTACH) {
+                if (!count_body_parts_check(&AttachAllow, bp))
+                    shallcount = 0;
+                if (count_body_parts_check(&AttachExclude, bp))
+                    shallcount = 0;
+            } else {
+                if (!count_body_parts_check(&InlineAllow, bp))
+                    shallcount = 0;
+                if (count_body_parts_check(&InlineExclude, bp))
+                    shallcount = 0;
+            }
+        }

 
 

-    debug_print(5, ("cbp: %p shallcount = %d\n", bp, shallcount));
+        bp->attach_qualifies = shallcount;
+        count += shallcount;

 
 

-    if (shallrecurse) {
-      debug_print(5, ("cbp: %p pre count = %d\n", bp, count));
-      bp->attach_count = count_body_parts(bp->parts, flags & ~M_PARTS_TOPLEVEL);
-      count += bp->attach_count;
-      debug_print(5, ("cbp: %p post count = %d\n", bp, count));
+        if (shallrecurse) {
+            bp->attach_count = count_body_parts(bp->parts,
+                                                flags & ~M_PARTS_TOPLEVEL);
+            count += bp->attach_count;
+        }

     }
     }

-  }

 
 

-  debug_print(5, ("bp: return %d\n", count < 0 ? 0 : count));
-  return count < 0 ? 0 : count;
+    return count;

 }
 
 }
 

-int mutt_count_body_parts (HEADER *hdr, int flags) {
-  if (!option (OPTCOUNTATTACH))
-    return (0);
-  if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT))
-    return hdr->attach_total;
+int mutt_count_body_parts(HEADER *hdr, int flags)
+{
+    if (!option(OPTCOUNTATTACH))
+        return 0;
+
+    if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT))
+        return hdr->attach_total;

 
 

-  if (AttachAllow || AttachExclude || InlineAllow || InlineExclude)
-    hdr->attach_total = count_body_parts(hdr->content, flags | M_PARTS_TOPLEVEL);
-  else
-    hdr->attach_total = 0;
+    if (AttachAllow || AttachExclude || InlineAllow || InlineExclude)
+        hdr->attach_total = count_body_parts(hdr->content,
+                                             flags | M_PARTS_TOPLEVEL);
+    else
+        hdr->attach_total = 0;

 
 

-  hdr->attach_valid = 1;
-  return hdr->attach_total;
+    hdr->attach_valid = 1;
+    return hdr->attach_total;

 }
 }