kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/net/ftp.rb (mtime): use usec instead of fractions to parse

Browse source 
decimal fractions of a second correctly when the number of digits
  is not 6.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2015-09-28 08:43:44 +00:00
parent 040ae91040
commit 275b38937e
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Sep 28 17:40:17 2015 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (mtime): use usec instead of fractions to parse
decimal fractions of a second correctly when the number of digits
is not 6.
Mon Sep 28 16:07:08 2015 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (mtime): parse decimal fractions of a second as

3
lib/net/ftp.rb
View file

@ -895,8 +895,7 @@ module Net
raise FTPProtoError, "invalid time-val: #{value}"
end
usec = fractions.to_i * 10 ** (6 - fractions.to_s.size)
Time.send(local ? :local : :utc,
year, month, day, hour, min, sec, fractions)
Time.send(local ? :local : :utc, year, month, day, hour, min, sec, usec)
}
FACT_PARSERS = Hash.new(CASE_DEPENDENT_PARSER)
FACT_PARSERS["size"] = DECIMAL_PARSER

11
test/net/ftp/test_ftp.rb
View file

@ -1108,6 +1108,10 @@ EOF
commands.push(sock.gets)
sock.print("213 20150910161739.123456\r\n")
commands.push(sock.gets)
sock.print("213 20150910161739.123\r\n")
commands.push(sock.gets)
sock.print("213 20150910161739.123456789\r\n")
commands.push(sock.gets)
sock.print("213 2015091016173\r\n")
}
begin
@ -1119,12 +1123,19 @@ EOF
ftp.mtime("foo.txt", true))
assert_equal(Time.utc(2015, 9, 10, 16, 17, 39, 123456),
ftp.mtime("bar.txt"))
assert_equal(Time.utc(2015, 9, 10, 16, 17, 39, 123000),
ftp.mtime("bar.txt"))
assert_equal(Time.utc(2015, 9, 10, 16, 17, 39,
Rational(123456789, 1000)),
ftp.mtime("bar.txt"))
assert_raise(Net::FTPProtoError) do
ftp.mtime("quux.txt")
end
assert_match("MDTM foo.txt\r\n", commands.shift)
assert_match("MDTM foo.txt\r\n", commands.shift)
assert_match("MDTM bar.txt\r\n", commands.shift)
assert_match("MDTM bar.txt\r\n", commands.shift)
assert_match("MDTM bar.txt\r\n", commands.shift)
assert_match("MDTM quux.txt\r\n", commands.shift)
assert_equal(nil, commands.shift)
ensure