Add "root" disposition to attachments command.

An initial inline part was previously always skipped, for the good
reasons outlined by @dgc in #217.

Unfortunately, some mail clients have started sending "attachments" as
the root (and only) part, more and more lately.  Although this may be
bad practice, Mutt should support counting these as "attachments".

To do so without breaking existing configs, add a "root" disposition
argument to the attachments command.  This will count an initial
inline part in a message or multipart container.

The existing code skipped counting for the "top-level" and recursive
calls, so group both of these cases under "root".

1 files changed, 18 insertions, 0 deletions

diff --git a/init.c b/init.c
index 6cde7d0f..26f8afcf 100644
--- a/init.c
+++ b/init.c
@@ -1316,6 +1316,8 @@ static int parse_attachments (BUFFER *buf, BUFFER *s, union pointer_long_t udata
     print_attach_list(AttachExclude, '-', "A");
     print_attach_list(InlineAllow,   '+', "I");
     print_attach_list(InlineExclude, '-', "I");
+    print_attach_list(RootAllow,     '+', "R");
+    print_attach_list(RootExclude,   '-', "R");
     mutt_any_key_to_continue (NULL);
     return 0;
   }
@@ -1339,6 +1341,13 @@ static int parse_attachments (BUFFER *buf, BUFFER *s, union pointer_long_t udata
     else
       listp = &InlineExclude;
   }
+  else if (!ascii_strncasecmp(category, "root", strlen(category)))
+  {
+    if (op == '+')
+      listp = &RootAllow;
+    else
+      listp = &RootExclude;
+  }
   else
   {
     strfcpy(err->data, _("attachments: invalid disposition"), err->dsize);
@@ -1381,6 +1390,8 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, union pointer_long_t uda
       mutt_free_list_generic(&AttachExclude, free_attachments_data);
       mutt_free_list_generic(&InlineAllow, free_attachments_data);
       mutt_free_list_generic(&InlineExclude, free_attachments_data);
+      mutt_free_list_generic(&RootAllow, free_attachments_data);
+      mutt_free_list_generic(&RootExclude, free_attachments_data);
       _attachments_clean();
       return 0;
   }
@@ -1404,6 +1415,13 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, union pointer_long_t uda
     else
       listp = &InlineExclude;
   }
+  else if (!ascii_strncasecmp(p, "root", strlen(p)))
+  {
+    if (op == '+')
+      listp = &RootAllow;
+    else
+      listp = &RootExclude;
+  }
   else
   {
     strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize);