simplify count_body_parts drastically.

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 40414d9..ceef3cc 100644 (file)
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -1205,91 +1205,59 @@ static int count_body_parts_check(LIST **checklist, BODY *b)
 
 /* -------------------- XXX: MC READ MARK ------------- */
 
-#define AT_COUNT(why) { shallcount = 1; }
-#define AT_NOCOUNT(why) { shallcount = 0; }
+static int count_body_parts (BODY *body, int flags)
+{
+    int count = 0;
+    BODY *bp;
 
-int count_body_parts (BODY *body, int flags) {
-  int count = 0;
-  int shallcount, shallrecurse;
-  BODY *bp;
+    if (!body)
+        return 0;
 
-  if (body == NULL)
-    return 0;
+    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);
 
-  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");
-    }
+        iscontainer  = bp->type == TYPEMESSAGE || bp->type == TYPEMULTIPART;
 
-    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 recurse in external bodies or multipart/alternatives */
+        shallrecurse = (bp->type == TYPEMESSAGE && tok != MIME_EXTERNAL_BODY)
+                    || (bp->type == TYPEMULTIPART && tok != MIME_ALTERNATIVE);
+
+        /* Don't count top level containers and fundamental inlines */
+        shallcount   = !(iscontainer && (flags & M_PARTS_TOPLEVEL))
+                    && !(!iscontainer && bp->disposition == DISPINLINE && bp == body);
 
-    if (shallcount)
-      count++;
-    bp->attach_qualifies = shallcount ? 1 : 0;
+        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))
+                    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) {