From: paul <paul>
Date: Fri, 9 Jul 2004 12:24:42 +0000 (+0000)
Subject: 2004-07-09 Juris Kalnins <juris@mt.lv>
X-Git-Tag: frr-2.0-rc1~3673
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b06c14f2e7cac5a2170f9d64182a99dbbc413674;p=mirror%2Ffrr.git

2004-07-09 Juris Kalnins <juris@mt.lv>

        * if.c: (if_cmp_func) fix for interface names where name is same,
          but one has no number, eg "devtyp" and "devtyp0".
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8cd79e3630..4ec441ae6b 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-09 Juris Kalnins <juris@mt.lv>
+
+	* if.c: (if_cmp_func) fix for interface names where name is same,
+	  but one has no number, eg "devtyp" and "devtyp0".
+	  
 2004-06-30  Greg Troxel  <gdt@poblano.ir.bbn.com>
 
 	* Makefile.am: Make libzebra shared.
diff --git a/lib/if.c b/lib/if.c
index ff5ec50aac..2e36eff361 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -74,10 +74,14 @@ if_cmp_func (struct interface *ifp1, struct interface *ifp2)
       return res;
 
     /* with identical name part, go to numeric part */
-
     p1 += l1;
     p2 += l1;
 
+    if (!*p1) 
+      return -1;
+    if (!*p2) 
+      return 1;
+
     x1 = strtol(p1, &p1, 10);
     x2 = strtol(p2, &p2, 10);