summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenis Vlasenko2006-11-10 23:25:53 +0000
committerDenis Vlasenko2006-11-10 23:25:53 +0000
commit067e3f031a2107c69d287d89b9543fbfe5c0a571 (patch)
tree35edda4508915e2b454d0c0ec48cd548deccd744 /networking
parent07159f0f0e2188b1ce3bf7bc6b282f08986fd5ee (diff)
downloadbusybox-067e3f031a2107c69d287d89b9543fbfe5c0a571.zip
busybox-067e3f031a2107c69d287d89b9543fbfe5c0a571.tar.gz
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 :)
Diffstat (limited to 'networking')
-rw-r--r--networking/nslookup.c2
-rw-r--r--networking/wget.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 89a2d64..cc5ff95 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -82,7 +82,7 @@ static int print_host(const char *hostname, const char *header)
while (cur) {
sockaddr_to_dotted(cur->ai_addr, str, sizeof(str));
printf("%s %s\nAddress: %s", header, hostname, str);
- s[0] = ' ';
+ str[0] = ' ';
if (getnameinfo(cur->ai_addr, cur->ai_addrlen, str+1, sizeof(str)-1, NULL, 0, NI_NAMEREQD))
str[0] = '\0';
puts(str);
diff --git a/networking/wget.c b/networking/wget.c
index 8850fdf..a4c6289 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -324,8 +324,9 @@ int wget_main(int argc, char **argv)
break;
/*FALLTHRU*/
default:
- chomp(buf);
- bb_error_msg_and_die("server returned error %s: %s", s, buf);
+ /* Show first line only and kill any ESC tricks */
+ buf[strcspn(buf, "\n\r\x1b")] = '\0';
+ bb_error_msg_and_die("server returned error: %s", buf);
}
/*
@@ -585,6 +586,8 @@ static FILE *open_socket(struct sockaddr_in *s_in)
{
FILE *fp;
+ /* glibc 2.4 seems to try seeking on it - ??! */
+ /* hopefully it understands what ESPIPE means... */
fp = fdopen(xconnect_tcp_v4(s_in), "r+");
if (fp == NULL)
bb_perror_msg_and_die("fdopen");