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

Allow lists for "nooption" and "nooptions" keywords.

Browse Source 
usr.sbin/config/config.y
	According to config(5), the "device", "devices",
	"nodevice", "nodevices", "option", "options",
	"nooption", and "nooptions" keywords can all take a
	comma-separated list of values.  However, the yacc code
	did not allow lists for "nooption" and "nooptions", only
	single values.  This commit fixes the yacc code to allow
	comma separated values for all the above keywords.

Submitted by:	asomers
MFC after:	1 week
Sponsored by:	Spectra Logic
MFSpectraBSD:	1095296 on 2014/10/07
This commit is contained in:
Will Andrews 2015-01-23 16:03:02 +00:00
parent abf607ed8f
commit ca71b908cc
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/config/config.y
View File

@ -178,7 +178,7 @@ Config_spec:
} |
OPTIONS Opt_list
|
NOOPTION Save_id { rmopt_schedule(&opt, $2); } |
NOOPTION NoOpt_list |
MAKEOPTIONS Mkopt_list
|
NOMAKEOPTION Save_id { rmopt_schedule(&mkopt, $2); } |
@ -225,6 +225,11 @@ Opt_list:
Option
;
NoOpt_list:
NoOpt_list COMMA NoOption
|
NoOption
;
Option:
Save_id {
newopt(&opt, $1, NULL, 0);
@ -236,6 +241,11 @@ Option:
newopt(&opt, $1, $3, 0);
} ;
NoOption:
Save_id {
rmopt_schedule(&opt, $1);
};
Opt_value:
ID { $$ = $1; } |
NUMBER {