Cleanup patch from Vladimir N. Oleynik.

[oweals/busybox.git] / wget.c

diff --git a/wget.c b/wget.c
index 419435362acb059ed0380dc92f44c47ae91ed1e7..438ecba2e29c1aa9aa5a0d6ec89e741d2b5513aa 100644 (file)
--- a/wget.c
+++ b/wget.c
@@ -16,6 +16,7 @@
 
 #include "busybox.h"
 #include <stdio.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -32,6 +33,18 @@
 #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);
@@ -282,7 +295,7 @@ FILE *open_socket(char *host, int port)
        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);
@@ -520,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.21 2001/01/24 20:28:35 andersen Exp $
+ *     $Id: wget.c,v 1.23 2001/01/27 08:24:38 andersen Exp $
  */