From f8c8bb116007ef1d3856a4e302229f0c47bc1499 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 21 Nov 2006 19:10:26 +0000 Subject: [PATCH] wget: yet another contortion for proftpd's PASV response. --- networking/wget.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/networking/wget.c b/networking/wget.c index abc011c..0c547c6 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -414,18 +414,18 @@ int wget_main(int argc, char **argv) pasv_error: bb_error_msg_and_die("bad response to %s: %s", "PASV", buf); } - // Response is "227 garbageN1,N2,N3,N4,P1,P2[)] + // Response is "227 garbageN1,N2,N3,N4,P1,P2[)garbage] // Server's IP is N1.N2.N3.N4 (we ignore it) // Server's port for data connection is P1*256+P2 s = strrchr(buf, ')'); - if (s && !s[1]) s[0] = '\0'; + if (s) s[0] = '\0'; s = strrchr(buf, ','); if (!s) goto pasv_error; - port = xatol_range(s+1, 0, 255); + port = xatou_range(s+1, 0, 255); *s = '\0'; s = strrchr(buf, ','); if (!s) goto pasv_error; - port += xatol_range(s+1, 0, 255) * 256; + port += xatou_range(s+1, 0, 255) * 256; s_in.sin_port = htons(port); dfp = open_socket(&s_in); -- 2.7.4