From owner-svn-src-head@FreeBSD.ORG  Sun Jul  3 20:59:57 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2F7C106566C;
	Sun,  3 Jul 2011 20:59:57 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C351F8FC19;
	Sun,  3 Jul 2011 20:59:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p63KxvwT040046;
	Sun, 3 Jul 2011 20:59:57 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p63Kxvdl040044;
	Sun, 3 Jul 2011 20:59:57 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201107032059.p63Kxvdl040044@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 3 Jul 2011 20:59:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223744 - head/usr.sbin/config
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jul 2011 20:59:57 -0000

Author: ed
Date: Sun Jul  3 20:59:57 2011
New Revision: 223744
URL: http://svn.freebsd.org/changeset/base/223744

Log:
  Improve portability of config(8).
  
  - Use strlen(dp->d_name) instead of the unportable dp->d_namlen. Rename
    i to len to make it slightly more descriptive and prevent negative
    indexing of the array.
  - Replace index() by strchr().
  
  This supposedly fixes compilation on GNU systems.
  
  Submitted by:	Robert Millan <rmh debian org> (original patch)
  MFC after:	3 weeks

Modified:
  head/usr.sbin/config/main.c

Modified: head/usr.sbin/config/main.c
==============================================================================
--- head/usr.sbin/config/main.c	Sun Jul  3 16:54:27 2011	(r223743)
+++ head/usr.sbin/config/main.c	Sun Jul  3 20:59:57 2011	(r223744)
@@ -577,7 +577,7 @@ cleanheaders(char *p)
 	struct dirent *dp;
 	struct file_list *fl;
 	struct hdr_list *hl;
-	int i;
+	size_t len;
 
 	remember("y.tab.h");
 	remember("setdefs.h");
@@ -591,12 +591,13 @@ cleanheaders(char *p)
 	if ((dirp = opendir(p)) == NULL)
 		err(EX_OSERR, "opendir %s", p);
 	while ((dp = readdir(dirp)) != NULL) {
-		i = dp->d_namlen - 2;
+		len = strlen(dp->d_name);
 		/* Skip non-headers */
-		if (dp->d_name[i] != '.' || dp->d_name[i + 1] != 'h')
+		if (len < 2 || dp->d_name[len - 2] != '.' ||
+		    dp->d_name[len - 1] != 'h')
 			continue;
 		/* Skip special stuff, eg: bus_if.h, but check opt_*.h */
-		if (index(dp->d_name, '_') &&
+		if (strchr(dp->d_name, '_') &&
 		    strncmp(dp->d_name, "opt_", 4) != 0)
 			continue;
 		/* Check if it is a target file */