Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check the duplication or the inconsistency before evaluating fopts.

This commit is contained in:
gehenna 2003-01-23 15:01:54 +00:00
parent 53ed48f326
commit 02681cddbc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/config/files.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: files.c,v 1.18 2003/01/23 14:57:40 gehenna Exp $ */ /* $NetBSD: files.c,v 1.19 2003/01/23 15:01:54 gehenna Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -339,10 +339,6 @@ fixdevsw(void)
fixdevmtab = ht_new(); fixdevmtab = ht_new();
TAILQ_FOREACH(dm, &alldevms, dm_next) { TAILQ_FOREACH(dm, &alldevms, dm_next) {
if (dm->dm_opts != NULL &&
!expr_eval(dm->dm_opts, fixsel, NULL))
continue;
res = ht_lookup(fixdevmtab, intern(dm->dm_name)); res = ht_lookup(fixdevmtab, intern(dm->dm_name));
if (res != NULL) { if (res != NULL) {
if (res->dm_cmajor != dm->dm_cmajor || if (res->dm_cmajor != dm->dm_cmajor ||
@ -372,6 +368,10 @@ fixdevsw(void)
} }
} }
if (dm->dm_opts != NULL &&
!expr_eval(dm->dm_opts, fixsel, NULL))
continue;
if (ht_lookup(cdevmtab, intern(dm->dm_name)) != NULL) { if (ht_lookup(cdevmtab, intern(dm->dm_name)) != NULL) {
xerror(dm->dm_srcfile, dm->dm_srcline, xerror(dm->dm_srcfile, dm->dm_srcline,
"device-major of character device '%s' is " "device-major of character device '%s' is "