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 e7381f78cdb495bc9a1aa765ef4c2ca116098fc1..5f3321c22fa73529108230a79516436cfa78e1cc 100755 (executable)
--- 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