diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-21 19:10:26 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-21 19:10:26 +0000 |
| commit | f8c8bb116007ef1d3856a4e302229f0c47bc1499 (patch) | |
| tree | 4ba3180e9ec8c6cc6322412f5c1b9f4e9cd67fe4 | |
| parent | 921f5df25fdb9d89bd02ac0030ebb6ca7e003f0d (diff) | |
| download | busybox-f8c8bb116007ef1d3856a4e302229f0c47bc1499.tar.gz | |
wget: yet another contortion for proftpd's PASV response.
| -rw-r--r-- | networking/wget.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/wget.c b/networking/wget.c index abc011c7d..0c547c651 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); |