httpd: reduce ifdef forest. comment out redundant PATH setting

[oweals/busybox.git] / networking / wget.c

diff --git a/networking/wget.c b/networking/wget.c
index a0d3e15e83c90bf066ea14cc59335c1a013588e2..a4c6289cb493ed16abe0de65aad52236a3ab056f 100644 (file)
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -286,7 +286,7 @@ int wget_main(int argc, char **argv)
 #endif
 
                        if (beg_range)
-                               fprintf(sfp, "Range: bytes="OFF_FMT"-\r\n", beg_range);
+                               fprintf(sfp, "Range: bytes=%"OFF_FMT"-\r\n", beg_range);
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
                        if (extra_headers)
                                fputs(extra_headers, sfp);
@@ -302,7 +302,7 @@ int wget_main(int argc, char **argv)
 
                        s = buf;
                        while (*s != '\0' && !isspace(*s)) ++s;
-                       while (isspace(*s)) ++s;
+                       s = skip_whitespace(s);
                        // FIXME: no error check
                        // xatou wouldn't work: "200 OK"
                        status = atoi(s);
@@ -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);
                        }
 
                        /*
@@ -427,7 +428,7 @@ int wget_main(int argc, char **argv)
                dfp = open_socket(&s_in);
 
                if (beg_range) {
-                       sprintf(buf, "REST "OFF_FMT, beg_range);
+                       sprintf(buf, "REST %"OFF_FMT, beg_range);
                        if (ftpcmd(buf, NULL, sfp, buf) == 350)
                                content_len -= beg_range;
                }
@@ -585,7 +586,9 @@ static FILE *open_socket(struct sockaddr_in *s_in)
 {
        FILE *fp;
 
-       fp = fdopen(xconnect(s_in), "r+");
+       /* 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");
 
@@ -676,7 +679,7 @@ getttywidth(void)
 {
        int width=0;
        get_terminal_width_height(0, &width, NULL);
-       return (width);
+       return width;
 }
 
 static void