Apply a patch from Evin Robertson -- new pivot_root applet.

[oweals/busybox.git] / wget.c

diff --git a/wget.c b/wget.c
index 438ecba2e29c1aa9aa5a0d6ec89e741d2b5513aa..c134427e44e78700b1793651b584883e41b847f6 100644 (file)
--- a/wget.c
+++ b/wget.c
@@ -148,7 +148,7 @@ int wget_main(int argc, char **argv)
 #endif
        }
        if (do_continue && !fname_out)
-               error_msg_and_die("cannot specify continue (-c) without a filename (-O)\n");
+               error_msg_and_die("cannot specify continue (-c) without a filename (-O)");
 
 
        /*
@@ -167,8 +167,7 @@ int wget_main(int argc, char **argv)
         * Open the output file stream.
         */
        if (fname_out != (char *)1) {
-               if ( (output=fopen(fname_out, (do_continue ? "a" : "w"))) == NULL)
-                       perror_msg_and_die("fopen(%s)", fname_out);
+               output = xfopen( fname_out, (do_continue ? "a" : "w") );
        } else {
                output = stdout;
        }
@@ -201,7 +200,7 @@ int wget_main(int argc, char **argv)
         */
        if (fgets(buf, sizeof(buf), sfp) == NULL) {
                close_and_delete_outfile(output, fname_out, do_continue);
-               error_msg_and_die("no response from server\n");
+               error_msg_and_die("no response from server");
        }
        for (s = buf ; *s != '\0' && !isspace(*s) ; ++s)
                ;
@@ -217,6 +216,7 @@ int wget_main(int argc, char **argv)
                        /*FALLTHRU*/
                default:
                        close_and_delete_outfile(output, fname_out, do_continue);
+                       chomp(buf);
                        error_msg_and_die("server returned error %d: %s", atoi(s), buf);
        }
 
@@ -231,7 +231,7 @@ int wget_main(int argc, char **argv)
                }
                if (strcasecmp(buf, "transfer-encoding") == 0) {
                        close_and_delete_outfile(output, fname_out, do_continue);
-                       error_msg_and_die("server wants to do %s transfer encoding\n", s);
+                       error_msg_and_die("server wants to do %s transfer encoding", s);
                        continue;
                }
        }
@@ -268,7 +268,7 @@ void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path)
        *uri_port = 80;
 
        if (strncmp(url, "http://", 7) != 0)
-               error_msg_and_die("not an http url: %s\n", url);
+               error_msg_and_die("not an http url: %s", url);
 
        *uri_host = url + 7;
 
@@ -298,7 +298,7 @@ FILE *open_socket(char *host, int port)
        memset(&sin, 0, sizeof(sin));
        sin.sin_family = AF_INET;
        if ((hp = (struct hostent *) gethostbyname(host)) == NULL)
-               error_msg_and_die("cannot resolve %s\n", host);
+               error_msg_and_die("cannot resolve %s", host);
        memcpy(&sin.sin_addr, hp->h_addr_list[0], hp->h_length);
        sin.sin_port = htons(port);
 
@@ -339,7 +339,7 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
 
        /* verify we are at the end of the header name */
        if (*s != ':')
-               error_msg_and_die("bad header line: %s\n", buf);
+               error_msg_and_die("bad header line: %s", buf);
 
        /* locate the start of the header value */
        for (*s++ = '\0' ; *s == ' ' || *s == '\t' ; ++s)
@@ -533,7 +533,7 @@ progressmeter(int flag)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $Id: wget.c,v 1.23 2001/01/27 08:24:38 andersen Exp $
+ *     $Id: wget.c,v 1.26 2001/02/01 16:49:30 kraai Exp $
  */