Fixes so "make allnoconfig" works again.

[oweals/busybox.git] / libbb / interface.c

diff --git a/libbb/interface.c b/libbb/interface.c
index f3655b0e08f1e1daa91dc176fb10c31d067fd994..65d7c4e7147fcd7830004f711b2d2ba0588d20c1 100644 (file)
--- a/libbb/interface.c
+++ b/libbb/interface.c
@@ -15,7 +15,7 @@
  *              that either displays or sets the characteristics of
  *              one or more of the system's networking interfaces.
  *
- * Version:     $Id: interface.c,v 1.23 2004/07/23 01:49:46 bug1 Exp $
+ * Version:     $Id: interface.c,v 1.25 2004/08/26 21:45:21 andersen Exp $
  *
  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *              and others.  Copyright 1993 MicroWalt Corporation
@@ -888,6 +888,20 @@ static int sockets_open(int family)
        return sfd;
 }
 
+#ifdef CONFIG_FEATURE_CLEAN_UP
+static void sockets_close(void)
+{
+       struct aftype **aft;
+       for (aft = aftypes; *aft != NULL; aft++) {
+               struct aftype *af = *aft;
+               if( af->fd != -1 ) {
+                       close(af->fd);
+                       af->fd = -1;
+               }
+       }
+}
+#endif
+
 /* like strcmp(), but knows about numbers */
 static int nstrcmp(const char *a, const char *b)
 {
@@ -988,30 +1002,35 @@ static int if_readconf(void)
 
 static char *get_name(char *name, char *p)
 {
-       while (isspace(*p))
-               p++;
-       while (*p) {
-               if (isspace(*p))
-                       break;
-               if (*p == ':') {        /* could be an alias */
-                       char *dot = p, *dotname = name;
-
-                       *name++ = *p++;
-                       while (isdigit(*p))
-                               *name++ = *p++;
-                       if (*p != ':') {        /* it wasn't, backup */
-                               p = dot;
-                               name = dotname;
-                       }
-                       if (*p == '\0')
-                               return NULL;
-                       p++;
-                       break;
+       /* Extract <name>[:<alias>] from nul-terminated p where p matches
+          <name>[:<alias>]: after leading whitespace.
+          If match is not made, set name empty and return unchanged p */
+       int namestart=0, nameend=0, aliasend;
+       while (isspace(p[namestart]))
+               namestart++;
+       nameend=namestart;
+       while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend]))
+               nameend++;
+       if (p[nameend]==':') {
+               aliasend=nameend+1;
+               while (p[aliasend] && isdigit(p[aliasend]))
+                       aliasend++;
+               if (p[aliasend]==':') {
+                       nameend=aliasend;
                }
-               *name++ = *p++;
+               if ((nameend-namestart)<IFNAMSIZ) {
+                       memcpy(name,&p[namestart],nameend-namestart);
+                       name[nameend-namestart]='\0';
+                       p=&p[nameend];
+               } else {
+                       /* Interface name too large */
+                       name[0]='\0';
+               }
+       } else {
+               /* first ':' not found - return empty */
+               name[0]='\0';
        }
-       *name++ = '\0';
-       return p;
+       return p + 1;
 }
 
 /* If scanf supports size qualifiers for %n conversions, then we can
@@ -1218,17 +1237,13 @@ static int if_fetch(struct interface *ife)
        }
 #endif
 
+#ifdef SIOCGIFMAP
        strcpy(ifr.ifr_name, ifname);
-       if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0)
-               memset(&ife->map, 0, sizeof(struct ifmap));
+       if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0)
+               ife->map = ifr.ifr_map;
        else
-               memcpy(&ife->map, &ifr.ifr_map, sizeof(struct ifmap));
-
-       strcpy(ifr.ifr_name, ifname);
-       if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0)
+#endif
                memset(&ife->map, 0, sizeof(struct ifmap));
-       else
-               ife->map = ifr.ifr_map;
 
 #ifdef HAVE_TXQUEUELEN
        strcpy(ifr.ifr_name, ifname);
@@ -1369,7 +1384,7 @@ static struct hwtype loop_hwtype = {
 #if HAVE_HWETHER
 #include <net/if_arp.h>
 
-#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
+#if (__GLIBC__ >=2 && __GLIBC_MINOR >= 1) || defined(_NEWLIB_VERSION)
 #include <net/ethernet.h>
 #else
 #include <linux/if_ether.h>
@@ -2073,6 +2088,8 @@ int display_interfaces(char *ifname)
 
        /* Do we have to show the current setup? */
        status = if_print(ifname);
-       close(skfd);
+#ifdef CONFIG_FEATURE_CLEAN_UP
+       sockets_close();
+#endif
        exit(status < 0);
 }