diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-10 23:25:53 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-10 23:25:53 +0000 |
commit | bd19a62c869354cc063cf3cc527fdb4973a34796 (patch) | |
tree | 35edda4508915e2b454d0c0ec48cd548deccd744 /networking | |
parent | 0bac639e951d47c42e881e24055c553a34876f59 (diff) | |
download | busybox-w32-bd19a62c869354cc063cf3cc527fdb4973a34796.tar.gz busybox-w32-bd19a62c869354cc063cf3cc527fdb4973a34796.tar.bz2 busybox-w32-bd19a62c869354cc063cf3cc527fdb4973a34796.zip |
wget: fix error message.
Bad:
wget http://127.0.0.1:81/fgdg/Makefile
Connecting to 127.0.0.1[127.0.0.1]:81
: HTTP/1.0 404 Not Foundror 404 Not Found
Good:
wget http://127.0.0.1:81/fgdg/Makefile
Connecting to 127.0.0.1[127.0.0.1]:81
get: server returned error: HTTP/1.0 404 Not Found
nslookup: fix my mistake
applets: make Bernhard Fischer <rep.nop@aon.at> happy :)
git-svn-id: svn://busybox.net/trunk/busybox@16528 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'networking')
-rw-r--r-- | networking/nslookup.c | 2 | ||||
-rw-r--r-- | networking/wget.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/networking/nslookup.c b/networking/nslookup.c index 89a2d6481..cc5ff95d6 100644 --- a/networking/nslookup.c +++ b/networking/nslookup.c | |||
@@ -82,7 +82,7 @@ static int print_host(const char *hostname, const char *header) | |||
82 | while (cur) { | 82 | while (cur) { |
83 | sockaddr_to_dotted(cur->ai_addr, str, sizeof(str)); | 83 | sockaddr_to_dotted(cur->ai_addr, str, sizeof(str)); |
84 | printf("%s %s\nAddress: %s", header, hostname, str); | 84 | printf("%s %s\nAddress: %s", header, hostname, str); |
85 | s[0] = ' '; | 85 | str[0] = ' '; |
86 | if (getnameinfo(cur->ai_addr, cur->ai_addrlen, str+1, sizeof(str)-1, NULL, 0, NI_NAMEREQD)) | 86 | if (getnameinfo(cur->ai_addr, cur->ai_addrlen, str+1, sizeof(str)-1, NULL, 0, NI_NAMEREQD)) |
87 | str[0] = '\0'; | 87 | str[0] = '\0'; |
88 | puts(str); | 88 | puts(str); |
diff --git a/networking/wget.c b/networking/wget.c index 8850fdfb7..a4c6289cb 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -324,8 +324,9 @@ int wget_main(int argc, char **argv) | |||
324 | break; | 324 | break; |
325 | /*FALLTHRU*/ | 325 | /*FALLTHRU*/ |
326 | default: | 326 | default: |
327 | chomp(buf); | 327 | /* Show first line only and kill any ESC tricks */ |
328 | bb_error_msg_and_die("server returned error %s: %s", s, buf); | 328 | buf[strcspn(buf, "\n\r\x1b")] = '\0'; |
329 | bb_error_msg_and_die("server returned error: %s", buf); | ||
329 | } | 330 | } |
330 | 331 | ||
331 | /* | 332 | /* |
@@ -585,6 +586,8 @@ static FILE *open_socket(struct sockaddr_in *s_in) | |||
585 | { | 586 | { |
586 | FILE *fp; | 587 | FILE *fp; |
587 | 588 | ||
589 | /* glibc 2.4 seems to try seeking on it - ??! */ | ||
590 | /* hopefully it understands what ESPIPE means... */ | ||
588 | fp = fdopen(xconnect_tcp_v4(s_in), "r+"); | 591 | fp = fdopen(xconnect_tcp_v4(s_in), "r+"); |
589 | if (fp == NULL) | 592 | if (fp == NULL) |
590 | bb_perror_msg_and_die("fdopen"); | 593 | bb_perror_msg_and_die("fdopen"); |