Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/nameif.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/nameif.c (modified) (4 diffs)

branches/3.3/mindi-busybox/networking/nameif.c

@@ -162 +162 @@
             *next++ = '\0';
         /* Check for selectors, mac= is assumed */
-        if (strncmp(selector, "bus=", 4) == 0) {
+        if (is_prefixed_with(selector, "bus=")) {
             ch->bus_info = xstrdup(selector + 4);
             found_selector++;
-        } else if (strncmp(selector, "driver=", 7) == 0) {
+        } else if (is_prefixed_with(selector, "driver=")) {
             ch->driver = xstrdup(selector + 7);
             found_selector++;
-        } else if (strncmp(selector, "phyaddr=", 8) == 0) {
+        } else if (is_prefixed_with(selector, "phyaddr=")) {
             ch->phy_address = xatoi_positive(selector + 8);
             found_selector++;
@@ -174 +174 @@
 #endif
             lmac = xmalloc(ETH_ALEN);
-            ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) != 0 ? 0 : 4), lmac);
+            ch->mac = ether_aton_r(selector + (is_prefixed_with(selector, "mac=") ? 4 : 0), lmac);
             if (ch->mac == NULL)
                 bb_error_msg_and_die("can't parse %s", selector);
@@ -293 +293 @@
                 continue;
             /* if we came here, all selectors have matched */
-            break;
+            goto found;
         }
         /* Nothing found for current interface */
-        if (!ch)
-            continue;
-
+        continue;
+ found:
         if (strcmp(ifr.ifr_name, ch->ifname) != 0) {
             strcpy(ifr.ifr_newname, ch->ifname);
@@ -314 +313 @@
         if (ENABLE_FEATURE_CLEAN_UP)
             delete_eth_table(ch);
-    }
+    } /* while */
+
     if (ENABLE_FEATURE_CLEAN_UP) {
-        for (ch = clist; ch; ch = ch->next)
+        ethtable_t *next;
+        for (ch = clist; ch; ch = next) {
+            next = ch->next;
             delete_eth_table(ch);
+        }
         config_close(parser);
     };