From a4fce2fabf06a1b1f9438148376b35e3dffd3eb5 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 25 Feb 2000 03:51:23 +0000 Subject: 2000-02-25 git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mailread.rb | 22 +++++++++++----------- lib/open3.rb | 9 ++++----- 2 files changed, 15 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/mailread.rb b/lib/mailread.rb index 2edcca002..ee86d353e 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 diff --git a/lib/open3.rb b/lib/open3.rb index 9e34acffc..27283f501 100644 --- a/lib/open3.rb +++ b/lib/open3.rb @@ -43,13 +43,12 @@ end if $0 == __FILE__ a = Open3.popen3("nroff -man") Thread.start do - while gets - a[0].print $_ + while line = gets + a[0].print line end a[0].close end - while a[1].gets - print ":", $_ + while line = a[1].gets + print ":", line end end - -- cgit