d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve portability of config(8).

Browse Source 
- 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
This commit is contained in:
Ed Schouten 2011-07-03 20:59:57 +00:00
parent a34c6aeb85
commit 0732dbfff5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/config/main.c
View File

@ -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 */