Minor refactoring: move 'boundary' inside 'if'

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index 9aab1b3e93c499fd9df152484b8481d0dd411f0e..164cebf7184a7bb1e38b07839d7b0705af4ece43 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -30,9 +30,6 @@ Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [
     sys.exit(code)
 
 
-def output(s):
-    gopts.outfile.write(s)
-
 def output_headers(msg):
     unix_from = msg.get_unixfrom()
     if unix_from:
@@ -249,7 +246,6 @@ def decode_file(infile):
     "Decode the entire message"
 
     msg = email.message_from_file(infile)
-    boundary = msg.get_boundary()
 
     if msg.is_multipart():
         decode_headers(msg)
@@ -258,6 +254,8 @@ def decode_file(infile):
         if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
             output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
 
+        boundary = msg.get_boundary()
+
         for subpart in msg.get_payload():
             output("\n--%s\n" % boundary)
             decode_part(subpart)
@@ -350,9 +348,12 @@ if __name__ == "__main__":
     la = len(arguments)
     if la == 0:
         gopts.input_filename = '-'
-        gopts.output_filename = '-'
         infile = sys.stdin
-        outfile = sys.stdout
+        if gopts.output_filename:
+            outfile = open(gopts.output_filename, 'w')
+        else:
+            gopts.output_filename = '-'
+            outfile = sys.stdout
     elif la in (1, 2):
         if (arguments[0] == '-'):
             gopts.input_filename = '-'
@@ -388,7 +389,10 @@ if __name__ == "__main__":
         gopts.host_name = socket.gethostname()
 
     gopts.outfile = outfile
-    decode_file(infile)
+    output = outfile.write
 
-    infile.close()
-    outfile.close()
+    try:
+        decode_file(infile)
+    finally:
+        infile.close()
+        outfile.close()