BSD 4_4 release

[unix-history] / usr / src / lib / libc / net / ns_ntoa.c

diff --git a/usr/src/lib/libc/net/ns_ntoa.c b/usr/src/lib/libc/net/ns_ntoa.c
index dbee910..0f01f0b 100644 (file)
--- a/usr/src/lib/libc/net/ns_ntoa.c
+++ b/usr/src/lib/libc/net/ns_ntoa.c
@@ -1,43 +1,75 @@
 /*
 /*

- * Copyright (c) 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1986, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
  */
 

-#ifndef lint
-static char sccsid[] = "@(#)ns_ntoa.c  6.1 (Berkeley) %G%";
-#endif not lint
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)ns_ntoa.c  8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */

 
 

-#include <sys/types.h>
+#include <sys/param.h>

 #include <netns/ns.h>
 #include <netns/ns.h>

+#include <stdio.h>

 
 char *
 ns_ntoa(addr)
 
 char *
 ns_ntoa(addr)

-struct ns_addr addr;
+       struct ns_addr addr;

 {
        static char obuf[40];
 {
        static char obuf[40];

-       char *spectHex();
-       u_long net;
+       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;
        u_char *uplim = up + 6;
        u_short port = htons(addr.x_port);
        register char *cp;
        char *cp2;
        register u_char *up = addr.x_host.c_host;
        u_char *uplim = up + 6;

+       static char *spectHex();

 
 

-       * (union ns_net *) &net = addr.x_net;
-       net = ntohl(net);
-       sprintf(obuf, "%lx", net);
+       net.net_e = addr.x_net;
+       sprintf(obuf, "%lx", ntohl(net.long_e));

        cp = spectHex(obuf);
        cp2 = cp + 1;
        while (*up==0 && up < uplim) up++;
        cp = spectHex(obuf);
        cp2 = cp + 1;
        while (*up==0 && up < uplim) up++;

-       if (up == uplim) return (obuf);
-       sprintf(cp, ".%x", *up++);
-       while (up < uplim) {
-               while (*cp) cp++;
-               sprintf(cp, "%02x", *up++);
+       if (up == uplim) {
+               if (port) {
+                       sprintf(cp, ".0");
+                       cp += 2;
+               }
+       } else {
+               sprintf(cp, ".%x", *up++);
+               while (up < uplim) {
+                       while (*cp) cp++;
+                       sprintf(cp, "%02x", *up++);
+               }
+               cp = spectHex(cp2);

        }
        }

-       cp = spectHex(cp2);

        if (port) {
                sprintf(cp, ".%x", port);
                spectHex(cp + 1);
        if (port) {
                sprintf(cp, ".%x", port);
                spectHex(cp + 1);


@@ -47,7 +79,7 @@ struct ns_addr addr;
 
 static char *
 spectHex(p0)
 
 static char *
 spectHex(p0)

-char *p0;
+       char *p0;

 {
        int ok = 0;
        int nonzero = 0;
 {
        int ok = 0;
        int nonzero = 0;