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 */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
