1 files changed, 8 insertions, 8 deletions
diff --git a/sample/uumerge.rb b/sample/uumerge.rb
index 418323c439..23f95ba465 100644
--- a/sample/uumerge.rb
+++ b/sample/uumerge.rb
@@ -8,32 +8,32 @@ end
 $sawbegin = 0
 $sawend = 0
 
-while gets()
-  if /^begin\s*(\d*)\s*(\S*)/
+while line = gets()
+  if /^begin\s*(\d*)\s*(\S*)/ =~ line
     $mode, $file = $1, $2
     $sawbegin+=1
     if out_stdout
       out = STDOUT
     else
-      out = open($file, "w") if $file != ""
+      out = File.open($file, "w") if $file != ""
     end
     out.binmode
     break
   end
 end
 
-raise "missing begin" unless $sawbegin
+raise "missing begin" unless $sawbegin > 0
 
 out.binmode
-while gets()
-  if /^end/
+while line = gets()
+  if /^end/ =~ line
     $sawend+=1
     out.close unless out_stdout
     File.chmod $mode.oct, $file unless out_stdout
     next
   end
-  sub(/[a-z]+$/, "")		# handle stupid trailing lowercase letters
-  next if /[a-z]/
+  line.sub!(/[a-z]+$/, "")	# handle stupid trailing lowercase letters
+  next if /[a-z]/ =~ line
   next if !(((($_[0] - 32) & 077) + 2) / 3 == $_.length / 4)
   out << $_.unpack("u") if $sawbegin > $sawend
 end