summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-07-03 04:59:24 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-07-03 04:59:24 +0000
commitfcaccdec88e5b1a16b7ab44c7481c7aa30932636 (patch)
treeac04b386f78441fb1b7ff6bee0e582e51420ab0c
parentc7ac35deb83c6fc93c76016958512308fcf989bb (diff)
downloadruby-fcaccdec88e5b1a16b7ab44c7481c7aa30932636.tar.gz
ruby-fcaccdec88e5b1a16b7ab44c7481c7aa30932636.tar.xz
ruby-fcaccdec88e5b1a16b7ab44c7481c7aa30932636.zip
* lib/net/ftp.rb (getbinaryfile): the second argument (localfile)
is now optional. * lib/net/ftp.rb (gettextfile): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/net/ftp.rb4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aa31131c7..48fa03a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 3 13:57:53 2002 Sean Chittenden <sean@ruby-lang.org>
+
+ * lib/net/ftp.rb (getbinaryfile): the second argument (localfile)
+ is now optional.
+
+ * lib/net/ftp.rb (gettextfile): ditto.
+
Wed Jul 3 13:45:42 2002 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb: use &block and yield for speed.
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index ff915fcd2..da380fcdb 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -327,7 +327,7 @@ module Net
end
end
- def getbinaryfile(remotefile, localfile,
+ def getbinaryfile(remotefile, localfile = File.basename(remotefile),
blocksize = DEFAULT_BLOCKSIZE, &block)
if @resume
rest_offset = File.size?(localfile)
@@ -347,7 +347,7 @@ module Net
end
end
- def gettextfile(remotefile, localfile, &block)
+ def gettextfile(remotefile, localfile = File.basename(remotefile), &block)
f = open(localfile, "w")
begin
retrlines("RETR " + remotefile) do |line|