From c949d84774b8dd734fa87a91117268e921850da9 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 6 Jan 2006 19:40:24 +0000
Subject: [PATCH] (cnumb): Ignore countries not in use instead of countries
 with empty names.  Clearer and safer.

---
 src/lib/subs/cnumb.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/subs/cnumb.c b/src/lib/subs/cnumb.c
index 667ad64f..5ae5ecb9 100644
--- a/src/lib/subs/cnumb.c
+++ b/src/lib/subs/cnumb.c
@@ -53,12 +53,14 @@ cnumb(s_char *cntry)
     for (cn = 0; cn < MAXNOC; cn++) {
 	if ((natp = getnatp(cn)) == 0)
 	    break;
+	if (natp->nat_stat == STAT_UNUSED)
+	    continue;
 	ncp = natp->nat_cnam;
 	for (cp = cntry; *cp == *ncp; cp++, ncp++) {
 	    if (*cp == 0)
 		return cn;
 	}
-	if (cp > cntry && *cp == 0) {
+	if (*cp == 0) {
 	    best = cn;
 	    bcount++;
 	}