From: Oleg Broytman <phd@phdru.name>
Date: Wed, 3 Aug 2016 15:24:31 +0000 (+0300)
Subject: Test and report mailcap filter's errors
X-Git-Tag: 2.7.0~22
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=9f247f1c7dd35d334713714209a76c27e990621d;p=mimedecode.git

Test and report mailcap filter's errors

Test if the mailcap filters' return code is 0 (success); if not - report
it in the X-MIME-Autoconverted header.
---

diff --git a/mimedecode.py b/mimedecode.py
index e7381f7..5f3321c 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -247,12 +247,16 @@ def decode_body(msg, s):
     outfile.close()
 
     pipe = os.popen(command, 'r')
-    s = pipe.read()
-    pipe.close()
+    new_s = pipe.read()
+    if pipe.close() is None: # result=0, Ok
+        s = new_s
     os.remove(filename)
 
     set_content_type(msg, "text/plain")
-    msg["X-MIME-Autoconverted"] = "from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
+    if s is new_s:
+        msg["X-MIME-Autoconverted"] = "from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
+    else:
+        msg["X-MIME-Autoconverted"] = "failed conversion from %s to text/plain by %s id %s" % (content_type, g.host_name, command.split()[0])
 
     return s