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

Handle defopt lists properly, as ':=' syntax introduce an additional 

element...  For that, introduce nvcat(nv1, nv2).
This commit is contained in:
cube 2007-01-12 21:49:51 +00:00
parent b7d531ed9e
commit 718ffd7615
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/config/defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: defs.h,v 1.18 2007/01/09 13:03:47 cube Exp $ */ /* $NetBSD: defs.h,v 1.19 2007/01/12 21:49:51 cube Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -558,6 +558,7 @@ __dead void panic(const char *, ...)
struct nvlist *newnv(const char *, const char *, void *, int, struct nvlist *); struct nvlist *newnv(const char *, const char *, void *, int, struct nvlist *);
void nvfree(struct nvlist *); void nvfree(struct nvlist *);
void nvfreel(struct nvlist *); void nvfreel(struct nvlist *);
struct nvlist *nvcat(struct nvlist *, struct nvlist *);
/* liby */ /* liby */
void yyerror(const char *); void yyerror(const char *);

4
usr.bin/config/gram.y
View File

@ -1,5 +1,5 @@
%{ %{
/* $NetBSD: gram.y,v 1.11 2007/01/09 13:03:47 cube Exp $ */ /* $NetBSD: gram.y,v 1.12 2007/01/12 21:49:51 cube Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -329,7 +329,7 @@ optdep:
WORD { $$ = $1; }; WORD { $$ = $1; };
defopts: defopts:
defopts defopt { $2->nv_next = $1; $$ = $2; } | defopts defopt { $$ = nvcat($2, $1); } |
defopt { $$ = $1; }; defopt { $$ = $1; };
defopt: defopt:

16
usr.bin/config/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.4 2006/09/03 07:45:40 dsl Exp $ */ /* $NetBSD: util.c,v 1.5 2007/01/12 21:49:51 cube Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -235,6 +235,20 @@ nvfreel(struct nvlist *nv)
} }
} }
struct nvlist *
nvcat(struct nvlist *nv1, struct nvlist *nv2)
{
struct nvlist *nv;
if (nv1 == NULL)
return nv2;
for (nv = nv1; nv->nv_next != NULL; nv = nv->nv_next);
nv->nv_next = nv2;
return nv1;
}
void void
warn(const char *fmt, ...) warn(const char *fmt, ...)
{ {