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] [-r header] [-R 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] [--remove-params=header] [-beit mask] [-o output_file] [input_file [output_file]]
""" % me)
if errormsg:
sys.stderr.write(errormsg + '\n')
for header in gopts.remove_headers:
del msg[header]
+ for header in gopts.remove_all_params:
+ value = msg[header]
+ if value is None:
+ continue
+ if ';' not in value:
+ continue
+ del msg[header]
+ msg[header] = value.split(';')[0].strip()
+
for header, param in gopts.remove_header_params:
msg.del_param(param, header)
remove_headers = []
# A list of headers parameters to remove
remove_header_params = []
+ # A list of headers to be stripped of all parameters
+ remove_all_params = []
totext_mask = [] # A list of content-types to decode
binary_mask = [] # A list to pass through
try:
options, arguments = getopt(sys.argv[1:],
'hVcCDPH:f:d:p:r:R:b:e:i:t:o:',
- ['help', 'version', 'host'])
+ ['help', 'version', 'host=', 'remove-params='])
except GetoptError:
usage(1)
gopts.remove_headers.append(value)
elif option == '-R':
gopts.remove_header_params.append(value.split(':', 1))
+ elif option == '--remove-params':
+ gopts.remove_all_params.append(value)
elif option == '-t':
gopts.totext_mask.append(value)
elif option == '-b':