1 files changed, 62 insertions, 55 deletions

diff --git a/src/lib/libc/net/if_nametoindex.c b/src/lib/libc/net/if_nametoindex.c
index ad05387e34..0318f60680 100644
--- a/src/lib/libc/net/if_nametoindex.c
+++ b/src/lib/libc/net/if_nametoindex.c
@@ -1,7 +1,7 @@
 /*
  * %%% copyright-cmetz-98-bsd
  * Copyright (c) 1998-1999, Craig Metz, All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -17,7 +17,7 @@
  * 4. Neither the name of the author nor the names of 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
@@ -29,7 +29,6 @@
  * 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.
- *
  */
 
 #include <sys/types.h>
@@ -38,69 +37,77 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <net/if_dl.h>
+#include <string.h>
 #include <errno.h>
 
-unsigned int if_nametoindex(const char *name)
+unsigned int 
+if_nametoindex(const char *name)
 {
-  int i, fd;
-  struct ifconf ifconf;
-  void *p;
-  int len;
-  char lastname[IFNAMSIZ + 1], *thisname;
-  unsigned int index = 0;
+        int     i, fd, len;
+        struct ifconf ifconf;
+        char    lastname[IFNAMSIZ], *thisname;
+        unsigned int index = 0;
+        struct sockaddr *sa;
+        void    *p;
+
+        if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
+                return 0;
 
-  if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
-    return 0;
+        ifconf.ifc_len = 0;
+        ifconf.ifc_buf = 0;
+        if (ioctl(fd, SIOCGIFCONF, (void *) &ifconf))
+                goto ret;
+        if (ifconf.ifc_len < IFNAMSIZ)
+                goto ret;
+        if (!(ifconf.ifc_buf = malloc(ifconf.ifc_len)))
+                goto ret;
+        if (ioctl(fd, SIOCGIFCONF, (void *) &ifconf))
+                goto ret;
 
-  ifconf.ifc_len = 0;
-  ifconf.ifc_buf = 0;
-  if (ioctl(fd, SIOCGIFCONF, (void *)&ifconf))
-    goto ret;
-  if (ifconf.ifc_len < IFNAMSIZ)
-    goto ret;
-  if (!(ifconf.ifc_buf = malloc(ifconf.ifc_len)))
-    goto ret;
-  if (ioctl(fd, SIOCGIFCONF, (void *)&ifconf))
-    goto ret;
+        i = 0;
+        p = ifconf.ifc_buf;
+        len = ifconf.ifc_len;
+        lastname[0] = 0;
+        lastname[sizeof(lastname)-1] = 0;
 
-  i = 0;
-  p = ifconf.ifc_buf;
-  len = ifconf.ifc_len;
-  lastname[0] = 0;
-  lastname[IFNAMSIZ] = 0;
+        while (len > 0) {
+                if (len < IFNAMSIZ + sizeof(struct sockaddr))
+                        goto ret;
 
-  while(len > 0) {
-    if (len < (IFNAMSIZ + sizeof(struct sockaddr)))
-      goto ret;
+                thisname = p;
+                if (strncmp(lastname, p, IFNAMSIZ)) {
+                        if (!strcmp(lastname, name)) {
+                                index = i;
+                                goto ret;
+                        }
+                        memcpy(lastname, thisname, IFNAMSIZ);
+                        i++;
+                }
 
-    if (strncmp(lastname, thisname = p, IFNAMSIZ)) {
-      if (!strcmp(lastname, name)) {
-        index = i;
-        goto ret;
-      };
-      memcpy(lastname, thisname, IFNAMSIZ);
-      i++;
-    };
+                len -= IFNAMSIZ;
+                p += IFNAMSIZ;
+                sa = (struct sockaddr *)p;
 
-    len -= IFNAMSIZ;
-    p += IFNAMSIZ;
+                if (!strncmp(thisname, name, IFNAMSIZ) &&
+                    sa->sa_family == AF_LINK) {
+                        struct sockaddr_dl *sd = p;
 
-    if (!strncmp(thisname, name, IFNAMSIZ) && (((struct sockaddr *)p)->sa_family == AF_LINK)) {
-      index = ((struct sockaddr_dl *)p)->sdl_index;
-      goto ret;
-    };
+                        index = sd->sdl_index;
+                        goto ret;
+                }
 
-    if (len < SA_LEN((struct sockaddr *)p))
-      goto ret;
-    len -= SA_LEN((struct sockaddr *)p);
-    p += SA_LEN((struct sockaddr *)p);
-  };
+                if (len < sa->sa_len)
+                        goto ret;
+                len -= sa->sa_len;
+                p += sa->sa_len;
+        }
 
-  if (!strcmp(lastname, name))
-    index = i;
+        if (!strcmp(lastname, name))
+                index = i;
 
 ret:
-  close(fd);
-  free(ifconf.ifc_buf);
-  return index;
-};
+        close(fd);
+        if (ifconf.ifc_buf)
+                free(ifconf.ifc_buf);
+        return index;
+}