diff options
| author | Denis Vlasenko | 2006-11-10 23:25:53 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-11-10 23:25:53 +0000 |
| commit | 067e3f031a2107c69d287d89b9543fbfe5c0a571 (patch) | |
| tree | 35edda4508915e2b454d0c0ec48cd548deccd744 | |
| parent | 07159f0f0e2188b1ce3bf7bc6b282f08986fd5ee (diff) | |
| download | busybox-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 :)
| -rw-r--r-- | applets/applets.c | 2 | ||||
| -rw-r--r-- | libbb/chomp.c | 5 | ||||
| -rw-r--r-- | networking/nslookup.c | 2 | ||||
| -rw-r--r-- | networking/wget.c | 7 |
4 files changed, 8 insertions, 8 deletions
diff --git a/applets/applets.c b/applets/applets.c index d8bb133..23f9e4f 100644 --- a/applets/applets.c +++ b/applets/applets.c @@ -20,7 +20,7 @@ /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */ #if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__) #warning Static linking against glibc produces buggy executables -#warning (glibc doesn't cope well with ld --gc-sections). +#warning (glibc does not cope well with ld --gc-sections). #warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400 #warning Note that glibc is utterly unsuitable for static linking anyway. #endif diff --git a/libbb/chomp.c b/libbb/chomp.c index 6165b83..eab7707 100644 --- a/libbb/chomp.c +++ b/libbb/chomp.c @@ -8,15 +8,12 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdio.h> -#include <string.h> #include "libbb.h" - void chomp(char *s) { char *lc = last_char_is(s, '\n'); - if(lc) + if (lc) *lc = 0; } 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"); |