2000-02-25

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

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/mailread.rb b/lib/mailread.rb
index 2edcca002a..ee86d353eb 100644
--- a/lib/mailread.rb
+++ b/lib/mailread.rb
@@ -9,25 +9,25 @@ class Mail
     @header = {}
     @body = []
     begin
-      while f.gets()
-	$_.chop!
-	next if /^From /	# skip From-line
-	break if /^$/		# end of header
+      while line = f.gets()
+	line.chop!
+	next if /^From /=~line	# skip From-line
+	break if /^$/=~line	# end of header
 
-	if /^(\S+):\s*(.*)/
+	if /^(\S+):\s*(.*)/=~line
 	  (attr = $1).capitalize!
 	  @header[attr] = $2
 	elsif attr
-	  sub!(/^\s*/, '')
-	  @header[attr] += "\n" + $_
+	  line.sub!(/^\s*/, '')
+	  @header[attr] += "\n" + line
 	end
       end
   
-      return unless $_
+      return unless line
 
-      while f.gets()
-	break if /^From /
-	@body.push($_)
+      while line = f.gets()
+	break if /^From /=~line
+	@body.push(line)
       end
     ensure
       f.close if opened