shugo	2012-03-26 23:43:27 +0900 (Mon, 26 Mar 2012)

  New Revision: 35141

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35141

  Log:
    * lib/net/ftp.rb (parse227, parse228, parse229): don't use $~.

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/ftp.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35140)
+++ ChangeLog	(revision 35141)
@@ -1,3 +1,7 @@
+Mon Mar 26 23:43:04 2012  Shugo Maeda  <shugo@r...>
+
+	* lib/net/ftp.rb (parse227, parse228, parse229): don't use $~.
+
 Mon Mar 26 23:34:40 2012  Shugo Maeda  <shugo@r...>
 
 	* lib/net/ftp.rb (parse227, parse228, parse229): don't use local
Index: lib/net/ftp.rb
===================================================================
--- lib/net/ftp.rb	(revision 35140)
+++ lib/net/ftp.rb	(revision 35141)
@@ -923,8 +923,8 @@
       if resp[0, 3] != "227"
         raise FTPReplyError, resp
       end
-      if /\((?<host>\d+(,\d+){3}),(?<port>\d+,\d+)\)/ =~ resp
-        return parse_pasv_ipv4_host($~["host"]), parse_pasv_port($~["port"])
+      if m = /\((?<host>\d+(,\d+){3}),(?<port>\d+,\d+)\)/.match(resp)
+        return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
       else
         raise FTPProtoError, resp
       end
@@ -939,10 +939,10 @@
       if resp[0, 3] != "228"
         raise FTPReplyError, resp
       end
-      if /\(4,4,(?<host>\d+(,\d+){3}),2,(?<port>\d+,\d+)\)/ =~ resp
-        return parse_pasv_ipv4_host($~["host"]), parse_pasv_port($~["port"])
-      elsif /\(6,16,(?<host>\d+(,(\d+)){15}),2,(?<port>\d+,\d+)\)/ =~ resp
-        return parse_pasv_ipv6_host($~["host"]), parse_pasv_port($~["port"])
+      if m = /\(4,4,(?<host>\d+(,\d+){3}),2,(?<port>\d+,\d+)\)/.match(resp)
+        return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
+      elsif m = /\(6,16,(?<host>\d+(,(\d+)){15}),2,(?<port>\d+,\d+)\)/.match(resp)
+        return parse_pasv_ipv6_host(m["host"]), parse_pasv_port(m["port"])
       else
         raise FTPProtoError, resp
       end
@@ -977,8 +977,8 @@
       if resp[0, 3] != "229"
         raise FTPReplyError, resp
       end
-      if /\((?<d>[!-~])\k<d>\k<d>(?<port>\d+)\k<d>\)/ =~ resp
-        return @sock.peeraddr[3], $~["port"].to_i
+      if m = /\((?<d>[!-~])\k<d>\k<d>(?<port>\d+)\k<d>\)/.match(resp)
+        return @sock.peeraddr[3], m["port"].to_i
       else
         raise FTPProtoError, resp
       end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/