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

Remove even known options if they are in the wrong options header. This

Browse Source 
fixes movement of options.  Stale copies were left behind.
This commit is contained in:
Bruce Evans 2000-01-09 12:52:01 +00:00
parent 39865d6488
commit 838aeb6957
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=55659
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/mkoptions.c
View File

@ -122,7 +122,7 @@ static void
do_option(name)
char *name;
{
char *file, *inw;
char *basefile, *file, *inw;
struct opt_list *ol;
struct opt *op, *op_head, *topp;
FILE *inf, *outf;
@ -166,6 +166,12 @@ do_option(name)
(void) fclose(outf);
return;
}
basefile = "";
for (ol = otab; ol != 0; ol = ol->o_next)
if (eq(name, ol->o_name)) {
basefile = ol->o_file;
break;
}
oldvalue = NULL;
op_head = NULL;
seen = 0;
@ -198,6 +204,10 @@ do_option(name)
printf("WARNING: unknown option `%s' removed from %s\n",
inw, file);
tidy++;
} else if (ol != NULL && !eq(basefile, ol->o_file)) {
printf("WARNING: option `%s' moved from %s to %s\n",
inw, basefile, ol->o_file);
tidy++;
} else {
op = (struct opt *) malloc(sizeof *op);
bzero(op, sizeof(*op));