Skip to content
Snippets Groups Projects
Commit 0afe7af2 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Simplified.

parent eb7de3e6
No related branches found
No related tags found
No related merge requests found
......@@ -36,34 +36,29 @@ cmd("cd pub")
cmd("cd gnu")
cmd("passive")
user_spawn_id = None
try:
user_spawn_id = pcl_expect.user.user(pcl_expect.user.COOKED)
user_spawn_id.send("ftp> ")
buf = ""
user_spawn_id = pcl_expect.user.user()
user_spawn_id.send("ftp> ")
buf = ""
x = pcl_expect.controller()
while x.loop():
if x.re(user_spawn_id, "..*"):
s = user_spawn_id.match.group()
buf += s
elif x.re(user_spawn_id, "\n"):
if buf == "home":
cmd("cd /pub/gnu/ftp.gnu.org/pub/gnu")
user_spawn_id.send("ftp> ")
else:
ftp.send(buf + "\n")
buf = ""
elif x.eof(user_spawn_id):
user_spawn_id.send("\nGot eof from stdin\n")
break
elif x.re(ftp, "(?s)..*"):
user_spawn_id.send(ftp.match.group())
elif x.eof(ftp):
user_spawn_id.send("\nGot eof from ftp process\n")
break
elif x.timeout():
pass
finally:
if user_spawn_id is not None:
user_spawn_id.close()
x = pcl_expect.controller()
while x.loop():
if x.re(user_spawn_id, "..*"):
s = user_spawn_id.match.group()
buf += s
elif x.re(user_spawn_id, "\n"):
if buf == "home":
cmd("cd /pub/gnu/ftp.gnu.org/pub/gnu")
user_spawn_id.send("ftp> ")
else:
ftp.send(buf + "\n")
buf = ""
elif x.eof(user_spawn_id):
user_spawn_id.send("\nGot eof from stdin\n")
break
elif x.re(ftp, "(?s)..*"):
user_spawn_id.send(ftp.match.group())
elif x.eof(ftp):
user_spawn_id.send("\nGot eof from ftp process\n")
break
elif x.timeout():
pass
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment