From b06c14f2e7cac5a2170f9d64182a99dbbc413674 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 9 Jul 2004 12:24:42 +0000 Subject: 2004-07-09 Juris Kalnins * if.c: (if_cmp_func) fix for interface names where name is same, but one has no number, eg "devtyp" and "devtyp0". --- lib/ChangeLog | 5 +++++ lib/if.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/ChangeLog b/lib/ChangeLog index 8cd79e36..4ec441ae 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2004-07-09 Juris Kalnins + + * 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 * Makefile.am: Make libzebra shared. diff --git a/lib/if.c b/lib/if.c index ff5ec50a..2e36eff3 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); -- cgit v1.2.1