jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-1' of https://github.com/acidvertigo/Nim into acidvertigo-patch-1

Browse source
This commit is contained in:
Dominik Picheta 2015-07-01 19:25:07 +01:00
commit d67e93340a
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pure/asyncftpclient.nim
View file

@ -79,7 +79,12 @@ proc connect*(ftp: AsyncFtpClient) {.async.} =
# 120 Service ready in nnn minutes. # 120 Service ready in nnn minutes.
# We wait until we receive 220. # We wait until we receive 220.
reply = await ftp.expectReply() reply = await ftp.expectReply()
# Handle 220 messages from the server
assertReply(reply, "220") assertReply(reply, "220")
while reply[3] == "-": # handle multiline 220 message
assertReply(reply, "220")
reply = await ftp.expectReply()
if ftp.user != "": if ftp.user != "":
assertReply(await(ftp.send("USER " & ftp.user)), "230", "331") assertReply(await(ftp.send("USER " & ftp.user)), "230", "331")

11
lib/pure/ftpclient.nim
View file

@ -263,8 +263,17 @@ proc connect*[T](ftp: FtpBase[T]) =
else: else:
{.fatal: "Incorrect socket instantiation".} {.fatal: "Incorrect socket instantiation".}
# TODO: Handle 120? or let user handle it. var reply = ftp.expectReply()
if reply.startsWith("120"):
# 120 Service ready in nnn minutes.
# We wait until we receive 220.
reply = ftp.expectReply()
# Handle 220 messages from the server
assertReply ftp.expectReply(), "220" assertReply ftp.expectReply(), "220"
while reply[3] == "-": # handle multiline 220 message
assertReply ftp.expectReply(), "220"
reply = ftp.expectReply()
if ftp.user != "": if ftp.user != "":
assertReply(ftp.send("USER " & ftp.user), "230", "331") assertReply(ftp.send("USER " & ftp.user), "230", "331")