Allow -t 'text/*' -b 'image/*' -B '*/*'

diff --git a/mimedecode.py b/mimedecode.py
index 9af561e90ddc4b87616c2d84f5041eae06be8ef9..1e3bf74b3964717de33883c8b160c19db805f664 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -312,7 +312,10 @@ def decode_part(msg):
 
     left_binary = False
     for content_type in masks:
-        if content_type in g.binary_mask:
+        if content_type in g.totext_mask or \
+           content_type in g.decoded_binary_mask:
+            break
+        elif content_type in g.binary_mask:
             left_binary = True
             break
 

diff --git a/test/test_all b/test/test_all
index 52b031392d545d21925b26ed9912b012f9099450..c7bdb286a82b09f62613e2458c715fff9d7b6805 100755 (executable)
--- a/test/test_all
+++ b/test/test_all
@@ -59,6 +59,7 @@ test_file msg_02.txt msg_02.txt --set-param=X-Test:test:set
 test_file msg_02.txt msg_02-1.txt --set-param=X-Mailer:test=set
 test_file msg_02.txt msg_02-1.txt --set-param=X-Mailer:test:set
 test_file msg_13.txt msg_13-1.txt -B '*/*'
+test_file msg_13.txt msg_13.txt -t 'text/*' -b 'image/*' -B '*/*'
 
 if [ "$RC" -eq 0 ]; then
    echo "All tests passed!"