Merge from head

3 files changed, 11 insertions, 13 deletions

diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index 6faf847..6561989 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -11,6 +11,8 @@ kernconf.c: kernconf.tmpl
 
 CFLAGS+= -I. -I${.CURDIR}
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 DPADD=	${LIBL} ${LIBSBUF}
 LDADD=	-ll -lsbuf
 
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index 81f820f..3e4e115 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -38,9 +38,6 @@
 #include "y.tab.h"
 #include "config.h"
 
-#define YY_NO_UNPUT
-#define YY_NO_INPUT
-
 /*
  * Data for returning to previous files from include files.
  */
@@ -96,7 +93,12 @@ unsigned int octal(const char *);
 unsigned int hex(const char *);
 int yyerror(const char *);
 
+#define YY_DECL int yylex(void)
 %}
+
+%option nounput
+%option noinput
+
 ID	[A-Za-z_][-A-Za-z_0-9]*
 PATH	[./][-/.%^A-Za-z_0-9]+
 %START TOEOL
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 3ed5495..78bb13d 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -706,17 +706,11 @@ kernconfdump(const char *file)
 		r = fgetc(fp);
 		if (r == EOF)
 			break;
-		/* 
-		 * If '\0' is present in the middle of the configuration
-		 * string, this means something very weird is happening.
-		 * Make such case very visible.  However, some architectures
-		 * pad the length of the section with NULs to a multiple of
-		 * sh_addralign, allow a NUL in that part of the section.
-		 */
-		if (r == '\0' && (size - i) < align)
+		if (r == '\0') {
+			assert(i == size - 1 &&
+			    ("\\0 found in the middle of a file"));
 			break;
-		assert(r != '\0' && ("Char present in the configuration "
-		    "string mustn't be equal to 0"));
+		}
 		fputc(r, stdout);
 	}
 	fclose(fp);