From 340936b70bdb4f940477575096982f8c30f45acd Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Tue, 24 Oct 2006 00:31:59 +0000
Subject: End my resistance to jmg's multiple hints files and bring in support
 for having multiple hints files generate a correct hints.c (eg, with all the
 specified ones catenated together).

---
 usr.sbin/config/config.y | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'usr.sbin/config/config.y')

diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 444fe58..40ee93d 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -81,7 +81,6 @@ struct	device_head dtab;
 char	*ident;
 char	*env;
 int	envmode;
-char	*hints;
 int	hintmode;
 int	yyline;
 const	char *yyfile;
@@ -191,10 +190,11 @@ Config_spec:
 		} |
 	HINTS ID
 	      = {
-		if (hints != NULL)
-			errx(1, "More than one 'hints' line at %s:%d", yyfile,
-			    yyline);
-		hints = $2;
+		struct hint *hint;
+
+		hint = (struct hint *)calloc(1, sizeof (struct hint));
+		hint->hint_name = $2;
+		STAILQ_INSERT_TAIL(&hints, hint, hint_next);
 		hintmode = 1;
 	        }
 
-- 
cgit v1.1