svn commit: r264326 - in stable/9: . usr.sbin/config

[Alan Somers]

Author: asomers
Date: Thu Apr 10 19:53:40 2014
New Revision: 264326
URL: http://svnweb.freebsd.org/changeset/base/264326

Log:
  MFC r263429
  
  Fix kern/187712: config(8) does not respect KERNCONFDIR.
  The impact of this bug is that you cannot build a kernel if both of the
  following are true:
  1) The kernel config file is in a non-default location
  2) The kernel config file uses the "include" statement from config(5).
  
  usr.sbin/config/main.c
  usr.sbin/config/config.8
  usr.sbin/config/config.h
  usr.sbin/config/lang.l
  	Added a "-I path" option to config(8).  By analogy to cc(1), it adds
  	an extra path in which the "include" statement will search for
  	files.
  
  Makefile.inc1
  	Pass "-I ${KERNCONFDIR}" to config(8).

Modified:
  stable/9/Makefile.inc1   (contents, props changed)
  stable/9/usr.sbin/config/config.8
  stable/9/usr.sbin/config/config.h
  stable/9/usr.sbin/config/lang.l
  stable/9/usr.sbin/config/main.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/usr.sbin/   (props changed)
  stable/9/usr.sbin/config/   (props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Thu Apr 10 19:51:33 2014	(r264325)
+++ stable/9/Makefile.inc1	Thu Apr 10 19:53:40 2014	(r264326)
@@ -926,7 +926,7 @@ buildkernel:
 	cd ${KRNLCONFDIR}; \
 		PATH=${TMPPATH} \
 		    config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
-			${KERNCONFDIR}/${_kernel}
+			-I ${KERNCONFDIR} ${KERNCONFDIR}/${_kernel}
 .endif
 .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
 	@echo

Modified: stable/9/usr.sbin/config/config.8
==============================================================================
--- stable/9/usr.sbin/config/config.8	Thu Apr 10 19:51:33 2014	(r264325)
+++ stable/9/usr.sbin/config/config.8	Thu Apr 10 19:53:40 2014	(r264326)
@@ -37,6 +37,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl CVgp
+.Op Fl I Ar path
 .Op Fl d Ar destdir
 .Ar SYSTEM_NAME
 .Nm
@@ -69,6 +70,12 @@ If the INCLUDE_CONFIG_FILE is present in
 kernel image will contain full configuration files included
 literally (preserving comments).
 This flag is kept for backward compatibility.
+.It Fl I Ar path
+Search in
+.Ar path
+for any file included by the 
+.Ic include
+directive.  This option may be specified more than once.
 .It Fl d Ar destdir
 Use
 .Ar destdir

Modified: stable/9/usr.sbin/config/config.h
==============================================================================
--- stable/9/usr.sbin/config/config.h	Thu Apr 10 19:51:33 2014	(r264325)
+++ stable/9/usr.sbin/config/config.h	Thu Apr 10 19:53:40 2014	(r264326)
@@ -144,6 +144,13 @@ struct hint {
 
 STAILQ_HEAD(hint_head, hint) hints;
 
+struct includepath {
+	char	*path;
+	SLIST_ENTRY(includepath) path_next;
+};
+
+SLIST_HEAD(, includepath) includepath;
+
 /*
  * Tag present in the kernelconf.tmlp template file. It's mandatory for those
  * two strings to be the same. Otherwise you'll get into trouble.

Modified: stable/9/usr.sbin/config/lang.l
==============================================================================
--- stable/9/usr.sbin/config/lang.l	Thu Apr 10 19:51:33 2014	(r264325)
+++ stable/9/usr.sbin/config/lang.l	Thu Apr 10 19:53:40 2014	(r264326)
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <stdlib.h>
 #include <string.h>
 #include "y.tab.h"
 #include "config.h"
@@ -257,6 +258,7 @@ include(const char *fname, int ateof)
 {
 	FILE *fp;
 	struct incl *in;
+	struct includepath* ipath;
 	char *fnamebuf;
 
 	fnamebuf = NULL;
@@ -269,6 +271,17 @@ include(const char *fname, int ateof)
 		}
 	}
 	if (fp == NULL) {
+		SLIST_FOREACH(ipath, &includepath, path_next) {
+			asprintf(&fnamebuf, "%s/%s", ipath->path, fname);
+			if (fnamebuf != NULL) {
+				fp = fopen(fnamebuf, "r");
+				free(fnamebuf);
+			}
+			if (fp != NULL)
+				break;
+		}
+	}
+	if (fp == NULL) {
 		yyerror("cannot open included file");
 		return (-1);
 	}

Modified: stable/9/usr.sbin/config/main.c
==============================================================================
--- stable/9/usr.sbin/config/main.c	Thu Apr 10 19:51:33 2014	(r264325)
+++ stable/9/usr.sbin/config/main.c	Thu Apr 10 19:53:40 2014	(r264326)
@@ -109,15 +109,25 @@ main(int argc, char **argv)
 	int ch, len;
 	char *p;
 	char *kernfile;
+	struct includepath* ipath;
 	int printmachine;
 
 	printmachine = 0;
 	kernfile = NULL;
-	while ((ch = getopt(argc, argv, "Cd:gmpVx:")) != -1)
+	SLIST_INIT(&includepath);
+	while ((ch = getopt(argc, argv, "CI:d:gmpVx:")) != -1)
 		switch (ch) {
 		case 'C':
 			filebased = 1;
 			break;
+		case 'I':
+			ipath = (struct includepath *) \
+			    	calloc(1, sizeof (struct includepath));
+			if (ipath == NULL)
+				err(EXIT_FAILURE, "calloc");
+			ipath->path = optarg;
+			SLIST_INSERT_HEAD(&includepath, ipath, path_next);
+			break;
 		case 'm':
 			printmachine = 1;
 			break;