1 files changed, 41 insertions, 37 deletions

diff --git a/src/lib/libc/net/ns_ntoa.c b/src/lib/libc/net/ns_ntoa.c
index ad3265399b..35d4f28aca 100644
--- a/src/lib/libc/net/ns_ntoa.c
+++ b/src/lib/libc/net/ns_ntoa.c
@@ -1,5 +1,3 @@
-/*      $NetBSD: ns_ntoa.c,v 1.4 1995/02/25 06:20:51 cgd Exp $  */
-
 /*
  * Copyright (c) 1986, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -34,73 +32,79 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ns_ntoa.c   8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$NetBSD: ns_ntoa.c,v 1.4 1995/02/25 06:20:51 cgd Exp $";
-#endif
+static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.11 2003/04/05 00:44:42 tdeval Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <netns/ns.h>
 #include <stdio.h>
 
+static char *spectHex(char *);
+
 char *
-ns_ntoa(addr)
-        struct ns_addr addr;
+ns_ntoa(struct ns_addr addr)
 {
         static char obuf[40];
-        union { union ns_net net_e; u_long long_e; } net;
-        u_short port = htons(addr.x_port);
-        register char *cp;
-        char *cp2;
-        register u_char *up = addr.x_host.c_host;
+        union { union ns_net net_e; u_int32_t long_e; } net;
+        in_port_t port = htons(addr.x_port);
+        char *cp, *cp2;
+        u_char *up = addr.x_host.c_host;
         u_char *uplim = up + 6;
-        static char *spectHex();
+        size_t rem;
 
         net.net_e = addr.x_net;
-        sprintf(obuf, "%lx", ntohl(net.long_e));
+        snprintf(obuf, sizeof obuf, "%x", ntohl(net.long_e));
         cp = spectHex(obuf);
+        rem = sizeof(obuf) - (cp - obuf);
         cp2 = cp + 1;
-        while (*up==0 && up < uplim) up++;
+        while (*up==0 && up < uplim)
+                up++;
         if (up == uplim) {
                 if (port) {
-                        sprintf(cp, ".0");
+                        snprintf(cp, rem, ".0");
                         cp += 2;
+                        rem -= 2;
                 }
         } else {
-                sprintf(cp, ".%x", *up++);
+                snprintf(cp, rem, ".%x", *up++);
                 while (up < uplim) {
-                        while (*cp) cp++;
-                        sprintf(cp, "%02x", *up++);
+                        while (*cp) {
+                                cp++;
+                                rem--;
+                        }
+                        snprintf(cp, rem, "%02x", *up++);
                 }
                 cp = spectHex(cp2);
+                rem = sizeof(obuf) - (cp - obuf);
         }
         if (port) {
-                sprintf(cp, ".%x", port);
+                snprintf(cp, rem, ".%x", port);
                 spectHex(cp + 1);
         }
         return (obuf);
 }
 
 static char *
-spectHex(p0)
-        char *p0;
+spectHex(char *p0)
 {
-        int ok = 0;
-        int nonzero = 0;
-        register char *p = p0;
-        for (; *p; p++) switch (*p) {
+        int ok = 0, nonzero = 0;
+        char *p = p0;
 
-        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-                *p += ('A' - 'a');
-                /* fall into . . . */
-        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-                ok = 1;
-        case '1': case '2': case '3': case '4': case '5':
-        case '6': case '7': case '8': case '9':
-                nonzero = 1;
+        for (; *p; p++) {
+                switch (*p) {
+                case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+                        *p += ('A' - 'a');
+                        /* fall into . . . */
+                case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+                        ok = 1;
+                case '1': case '2': case '3': case '4': case '5':
+                case '6': case '7': case '8': case '9':
+                        nonzero = 1;
+                }
+        }
+        if (nonzero && !ok) {
+                *p++ = 'H';
+                *p = 0;
         }
-        if (nonzero && !ok) { *p++ = 'H'; *p = 0; }
         return (p);
 }