Fix 'thinko'.

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

diff --git a/networking/ping.c b/networking/ping.c
index 476c15cea20e1c4610864a94583a9d75944a0d47..28b38db1407cc0f883f99ad5d0da7c51cc759f25 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.47 2001/10/24 04:59:56 andersen Exp $
+ * $Id: ping.c,v 1.54 2003/03/19 09:12:38 mjn3 Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -176,11 +176,10 @@ static int in_cksum(unsigned short *buf, int sz)
 /* simple version */
 #ifndef CONFIG_FEATURE_FANCY_PING
 static char *hostname = NULL;
-
 static void noresp(int ign)
 {
        printf("No response from %s\n", hostname);
-       exit(0);
+       exit(EXIT_FAILURE);
 }
 
 static void ping(const char *host)
@@ -209,7 +208,7 @@ static void ping(const char *host)
                           (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
 
        if (c < 0 || c != sizeof(packet))
-               perror_msg_and_die("sendto");
+               bb_perror_msg_and_die("sendto");
 
        signal(SIGALRM, noresp);
        alarm(5);                                       /* give the host 5000ms to respond */
@@ -222,7 +221,7 @@ static void ping(const char *host)
                                                  (struct sockaddr *) &from, &fromlen)) < 0) {
                        if (errno == EINTR)
                                continue;
-                       perror_msg("recvfrom");
+                       bb_perror_msg("recvfrom");
                        continue;
                }
                if (c >= 76) {                  /* ip + icmp */
@@ -242,23 +241,24 @@ extern int ping_main(int argc, char **argv)
        argc--;
        argv++;
        if (argc < 1)
-               show_usage();
+               bb_show_usage();
        ping(*argv);
        return EXIT_SUCCESS;
 }
 
 #else /* ! CONFIG_FEATURE_FANCY_PING */
 /* full(er) version */
-static char *hostname = NULL;
 static struct sockaddr_in pingaddr;
 static int pingsock = -1;
 static int datalen; /* intentionally uninitialized to work around gcc bug */
 
-static long ntransmitted = 0, nreceived = 0, nrepeats = 0, pingcount = 0;
-static int myid = 0, options = 0;
-static unsigned long tmin = ULONG_MAX, tmax = 0, tsum = 0;
+static long ntransmitted, nreceived, nrepeats, pingcount;
+static int myid, options;
+static unsigned long tmin = ULONG_MAX, tmax, tsum;
 static char rcvd_tbl[MAX_DUP_CHK / 8];
 
+struct hostent *hostent;
+
 static void sendping(int);
 static void pingstats(int);
 static void unpack(char *, int, struct sockaddr_in *);
@@ -271,7 +271,7 @@ static void pingstats(int junk)
 
        signal(SIGINT, SIG_IGN);
 
-       printf("\n--- %s ping statistics ---\n", hostname);
+       printf("\n--- %s ping statistics ---\n", hostent->h_name);
        printf("%ld packets transmitted, ", ntransmitted);
        printf("%ld packets received, ", nreceived);
        if (nrepeats)
@@ -313,9 +313,9 @@ static void sendping(int junk)
                           (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
 
        if (i < 0)
-               perror_msg_and_die("sendto");
+               bb_perror_msg_and_die("sendto");
        else if ((size_t)i != sizeof(packet))
-               error_msg_and_die("ping wrote %d chars; %d expected", i,
+               bb_error_msg_and_die("ping wrote %d chars; %d expected", i,
                           (int)sizeof(packet));
 
        signal(SIGALRM, sendping);
@@ -410,14 +410,12 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
                printf("\n");
        } else 
                if (icmppkt->icmp_type != ICMP_ECHO)
-                       error_msg("Warning: Got ICMP %d (%s)",
+                       bb_error_msg("Warning: Got ICMP %d (%s)",
                                        icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type));
 }
 
 static void ping(const char *host)
 {
-       struct hostent *h;
-       char buf[MAXHOSTNAMELEN];
        char packet[datalen + MAXIPLEN + MAXICMPLEN];
        int sockopt;
 
@@ -426,13 +424,11 @@ static void ping(const char *host)
        memset(&pingaddr, 0, sizeof(struct sockaddr_in));
 
        pingaddr.sin_family = AF_INET;
-       h = xgethostbyname(host);
-       if (h->h_addrtype != AF_INET)
-               error_msg_and_die("unknown address type; only AF_INET is currently supported.");
+       hostent = xgethostbyname(host);
+       if (hostent->h_addrtype != AF_INET)
+               bb_error_msg_and_die("unknown address type; only AF_INET is currently supported.");
 
-       memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr));
-       strncpy(buf, h->h_name, sizeof(buf) - 1);
-       hostname = buf;
+       memcpy(&pingaddr.sin_addr, hostent->h_addr, sizeof(pingaddr.sin_addr));
 
        /* enable broadcast pings */
        sockopt = 1;
@@ -445,7 +441,7 @@ static void ping(const char *host)
                           sizeof(sockopt));
 
        printf("PING %s (%s): %d data bytes\n",
-                  hostname,
+                  hostent->h_name,
                   inet_ntoa(*(struct in_addr *) &pingaddr.sin_addr.s_addr),
                   datalen);
 
@@ -464,7 +460,7 @@ static void ping(const char *host)
                                                  (struct sockaddr *) &from, &fromlen)) < 0) {
                        if (errno == EINTR)
                                continue;
-                       perror_msg("recvfrom");
+                       bb_perror_msg("recvfrom");
                        continue;
                }
                unpack(packet, c, &from);
@@ -493,24 +489,24 @@ extern int ping_main(int argc, char **argv)
                        break;
                case 'c':
                        if (--argc <= 0)
-                               show_usage();
+                               bb_show_usage();
                        argv++;
                        pingcount = atoi(*argv);
                        break;
                case 's':
                        if (--argc <= 0)
-                               show_usage();
+                               bb_show_usage();
                        argv++;
                        datalen = atoi(*argv);
                        break;
                default:
-                       show_usage();
+                       bb_show_usage();
                }
                argc--;
                argv++;
        }
        if (argc < 1)
-               show_usage();
+               bb_show_usage();
 
        myid = getpid() & 0xFFFF;
        ping(*argv);