Major coreutils update.

1 files changed, 13 insertions, 13 deletions

diff --git a/networking/ping.c b/networking/ping.c
index 044b547ac..28b38db14 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.53 2003/01/12 06:08:33 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>
@@ -208,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 */
@@ -221,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 */
@@ -241,7 +241,7 @@ extern int ping_main(int argc, char **argv)
         argc--;
         argv++;
         if (argc < 1)
-                show_usage();
+                bb_show_usage();
         ping(*argv);
         return EXIT_SUCCESS;
 }
@@ -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,7 +410,7 @@ 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));
 }
 
@@ -426,7 +426,7 @@ static void ping(const char *host)
         pingaddr.sin_family = AF_INET;
         hostent = xgethostbyname(host);
         if (hostent->h_addrtype != AF_INET)
-                error_msg_and_die("unknown address type; only AF_INET is currently supported.");
+                bb_error_msg_and_die("unknown address type; only AF_INET is currently supported.");
 
         memcpy(&pingaddr.sin_addr, hostent->h_addr, sizeof(pingaddr.sin_addr));
 
@@ -460,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);
@@ -489,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);