4.4BSD snapshot (revision 8.1); add 1993 to copyright

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

diff --git a/usr/src/lib/libc/net/linkaddr.c b/usr/src/lib/libc/net/linkaddr.c
index 3239f17..d2ff6c4 100644 (file)
--- a/usr/src/lib/libc/net/linkaddr.c
+++ b/usr/src/lib/libc/net/linkaddr.c
@@ -1,12 +1,12 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  *
  * %sccs.include.redist.c%
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)linkaddr.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>


@@ -56,20 +56,32 @@ link_addr(addr, sdl)
                switch (state /* | INPUT */) {
                case NAMING | DIGIT:
                case NAMING | LETTER:
                switch (state /* | INPUT */) {
                case NAMING | DIGIT:
                case NAMING | LETTER:

-                       *cp++ = addr[-1]; continue;
+                       *cp++ = addr[-1];
+                       continue;

                case NAMING | DELIM:
                case NAMING | DELIM:

-                       state = RESET; sdl->sdl_nlen = cp - sdl->sdl_data; continue;
+                       state = RESET;
+                       sdl->sdl_nlen = cp - sdl->sdl_data;
+                       continue;

                case GOTTWO | DIGIT:
                case GOTTWO | DIGIT:

-                       *cp++ = byte; /*FALLTHROUGH*/
+                       *cp++ = byte;
+                       /* FALLTHROUGH */

                case RESET | DIGIT:
                case RESET | DIGIT:

-                       state = GOTONE; byte = new; continue;
+                       state = GOTONE;
+                       byte = new;
+                       continue;

                case GOTONE | DIGIT:
                case GOTONE | DIGIT:

-                       state = GOTTWO; byte = new + (byte << 4); continue;
+                       state = GOTTWO;
+                       byte = new + (byte << 4);
+                       continue;

                default: /* | DELIM */
                default: /* | DELIM */

-                       state = RESET; *cp++ = byte; byte = 0; continue;
+                       state = RESET;
+                       *cp++ = byte;
+                       byte = 0;
+                       continue;

                case GOTONE | END:
                case GOTTWO | END:
                case GOTONE | END:
                case GOTTWO | END:

-                       *cp++ = byte; /* FALLTHROUGH */
+                       *cp++ = byte;
+                       /* FALLTHROUGH */

                case RESET | END:
                        break;
                }
                case RESET | END:
                        break;
                }


@@ -92,16 +104,20 @@ link_ntoa(sdl)
        register char *out = obuf; 
        register int i;
        register u_char *in = (u_char *)LLADDR(sdl);
        register char *out = obuf; 
        register int i;
        register u_char *in = (u_char *)LLADDR(sdl);

-       u_char *inlim = in + sdl->sdl_nlen;
+       u_char *inlim = in + sdl->sdl_alen;

        int firsttime = 1;
 
        if (sdl->sdl_nlen) {
                bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
                out += sdl->sdl_nlen;
        int firsttime = 1;
 
        if (sdl->sdl_nlen) {
                bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
                out += sdl->sdl_nlen;

-               *out++ = ':';
+               if (sdl->sdl_alen)
+                       *out++ = ':';

        }
        while (in < inlim) {
        }
        while (in < inlim) {

-               if (firsttime) firsttime = 0; else *out++ = '.';
+               if (firsttime)
+                       firsttime = 0;
+               else
+                       *out++ = '.';

                i = *in++;
                if (i > 0xf) {
                        out[1] = hexlist[i & 0xf];
                i = *in++;
                if (i > 0xf) {
                        out[1] = hexlist[i & 0xf];


@@ -112,5 +128,5 @@ link_ntoa(sdl)
                        *out++ = hexlist[i];
        }
        *out = 0;
                        *out++ = hexlist[i];
        }
        *out = 0;

-       return(obuf);
+       return (obuf);

 }
 }