This commit was generated by cvs2svn to compensate for changes in r11,

which included commits to RCS files with non-trunk default branches.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 21 insertions, 22 deletions

diff --git a/lib/mailread.rb b/lib/mailread.rb
index d9feffbb7a..a5d60c84b4 100644
--- a/lib/mailread.rb
+++ b/lib/mailread.rb
@@ -1,36 +1,35 @@
 class Mail
-  def Mail.new(f)
+
+  def initialize(f)
     unless f.kind_of?(IO)
       f = open(f, "r")
-      me = super(f)
-      f.close
-    else
-      me = super
+      opened = true
     end
-    return me
-  end
 
-  def initialize(f)
     @header = {}
     @body = []
-    while f.gets()
-      $_.chop!
-      next if /^From /		# skip From-line
-      break if /^$/		# end of header
+    begin
+      while f.gets()
+	$_.chop!
+	next if /^From /	# skip From-line
+	break if /^$/		# end of header
 
-      if /^(\S+):\s*(.*)/
-	@header[attr = $1.capitalize!] = $2
-      elsif attr
-	sub!(/^\s*/, '')
-	@header[attr] += "\n" + $_
+	if /^(\S+):\s*(.*)/
+	  @header[attr = $1.capitalize!] = $2
+	elsif attr
+	  sub!(/^\s*/, '')
+	  @header[attr] += "\n" + $_
+	end
       end
-    end
   
-    return unless $_
+      return unless $_
 
-    while f.gets()
-      break if /^From /
-      @body.push($_)
+      while f.gets()
+	break if /^From /
+	@body.push($_)
+      end
+    ensure
+      f.close if opened
     end
   end