summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-12 12:29:32 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-12 12:29:32 +0000
commit2ec793ab270ab1edeab503355eb627144cc05b70 (patch)
tree2d203b6feef0661735680902fad9d585b33e72b1 /lib
parentf6d77bf56082a9d0b21301384daf8ce9cbfccd4c (diff)
* lib/net/ftp.rb (FACT_PARSERS): support system dependent facts
UNIX.mode, UNIX.owner, UNIX.group, UNIX.ctime, and UNIX.atime. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/ftp.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index f4f7494a04..d3bb450a93 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -772,7 +772,8 @@ module Net
CASE_DEPENDENT_PARSER = ->(value) { value }
CASE_INDEPENDENT_PARSER = ->(value) { value.downcase }
- INTEGER_PARSER = ->(value) { value.to_i }
+ DECIMAL_PARSER = ->(value) { value.to_i }
+ OCTAL_PARSER = ->(value) { value.to_i(8) }
TIME_PARSER = ->(value) {
t = Time.strptime(value.sub(/\.\d+\z/, "") + "Z", "%Y%m%d%H%M%S%z")
fractions = value.slice(/\.(\d+)\z/, 1)
@@ -783,7 +784,7 @@ module Net
end
}
FACT_PARSERS = Hash.new(CASE_DEPENDENT_PARSER)
- FACT_PARSERS["size"] = INTEGER_PARSER
+ FACT_PARSERS["size"] = DECIMAL_PARSER
FACT_PARSERS["modify"] = TIME_PARSER
FACT_PARSERS["create"] = TIME_PARSER
FACT_PARSERS["type"] = CASE_INDEPENDENT_PARSER
@@ -792,6 +793,11 @@ module Net
FACT_PARSERS["lang"] = CASE_INDEPENDENT_PARSER
FACT_PARSERS["media-type"] = CASE_INDEPENDENT_PARSER
FACT_PARSERS["charset"] = CASE_INDEPENDENT_PARSER
+ FACT_PARSERS["unix.mode"] = OCTAL_PARSER
+ FACT_PARSERS["unix.owner"] = DECIMAL_PARSER
+ FACT_PARSERS["unix.group"] = DECIMAL_PARSER
+ FACT_PARSERS["unix.ctime"] = TIME_PARSER
+ FACT_PARSERS["unix.atime"] = TIME_PARSER
def parse_mlsx_entry(entry)
facts, pathname = entry.split(" ")