#include <arpa/inet.h>
#include <netdb.h>
+/* Stupid libc5 doesn't define this... */
+#ifndef timersub
+#define timersub(a, b, result) \
+ do { \
+ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
+ (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
+ if ((result)->tv_usec < 0) { \
+ --(result)->tv_sec; \
+ (result)->tv_usec += 1000000; \
+ } \
+ } while (0)
+#endif
void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path);
FILE *open_socket(char *host, int port);
fname_out = (strcmp(optarg, "-") == 0 ? (char *)1 : optarg);
break;
default:
- usage(wget_usage);
+ show_usage();
}
}
if (argc - optind != 1)
- usage(wget_usage);
+ show_usage();
/*
* Use the proxy if necessary.
#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)");
/*
* 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;
}
*/
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)
;
/*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);
}
}
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;
}
}
*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;
int fd;
FILE *fp;
- memzero(&sin, sizeof(sin));
+ 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);
/* 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)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.22 2001/01/26 02:04:49 andersen Exp $
+ * $Id: wget.c,v 1.27 2001/02/14 21:23:06 andersen Exp $
*/