From 46776da2aa3432ba72873aede6b727450aed4de1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 10 Jul 2008 09:39:50 +0000 Subject: merge revision(s) 17868: * lib/net/ftp.rb (Net::FTP#sendport): use divmod. [ruby-core:17557] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/ftp.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index dfbcf1499f..bee60d559c 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -278,12 +278,9 @@ module Net def sendport(host, port) af = (@sock.peeraddr)[0] if af == "AF_INET" - hbytes = host.split(".") - pbytes = [port / 256, port % 256] - bytes = hbytes + pbytes - cmd = "PORT " + bytes.join(",") + cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",") elsif af == "AF_INET6" - cmd = "EPRT |2|" + host + "|" + sprintf("%d", port) + "|" + cmd = sprintf("EPRT |2|%s|%d|", host, port) else raise FTPProtoError, host end -- cgit v1.2.3