def usage(code=0, errormsg=''):
version(0)
sys.stdout.write("""\
-Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [-d header] [-p header:param] [-beit mask] [-o output_file] [input_file [output_file]]
+Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [-d header] [-p header:param] [-r header] [-R header:param] [-beit mask] [-o output_file] [input_file [output_file]]
""" % me)
if errormsg:
sys.stderr.write(errormsg + '\n')
def decode_headers(msg):
"Decode message headers according to global options"
+ for header in gopts.remove_headers:
+ del msg[header]
+
+ for header, param in gopts.remove_header_params:
+ msg.del_param(param, header)
+
for header in gopts.decode_headers:
decode_header(msg, header)
decode_headers = ["From", "To", "Cc", "Reply-To", "Mail-Followup-To",
"Subject"]
- # A list of headers' parameters to decode
+ # A list of headers parameters to decode
decode_header_params = [
("Content-Type", "name"),
("Content-Disposition", "filename"),
]
+ # A list of headers to remove
+ remove_headers = []
+ # A list of headers parameters to remove
+ remove_header_params = []
+
totext_mask = [] # A list of content-types to decode
binary_mask = [] # A list to pass through
ignore_mask = [] # Ignore (skip, do not decode and do not include into output)
from getopt import getopt, GetoptError
try:
- options, arguments = getopt(sys.argv[1:], 'hVcCDPH:f:d:p:b:e:i:t:o:',
+ options, arguments = getopt(sys.argv[1:],
+ 'hVcCDPH:f:d:p:r:R:b:e:i:t:o:',
['help', 'version', 'host'])
except GetoptError:
usage(1)
gopts.decode_header_params.append(value.split(':', 1))
elif option == '-P':
gopts.decode_header_params = []
+ elif option == '-r':
+ gopts.remove_headers.append(value)
+ elif option == '-R':
+ gopts.remove_header_params.append(value.split(':', 1))
elif option == '-t':
gopts.totext_mask.append(value)
elif option == '-b':