Attachment #140991 for bug #187712

Lines 1013-1019 Link Here

(-)Makefile.inc1 (-1 / +1 lines)
1013	@echo ">>> stage 1: configuring the kernel"	1013	@echo ">>> stage 1: configuring the kernel"
1014	@echo "--------------------------------------------------------------"	1014	@echo "--------------------------------------------------------------"
1015	cd ${KRNLCONFDIR}; \	1015	cd ${KRNLCONFDIR}; \
1016	PATH=${TMPPATH} \	1016	PATH=${TMPPATH} KERNCONFDIR=${KERNCONFDIR} \
1017	config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \	1017	config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
1018	${KERNCONFDIR}/${_kernel}	1018	${KERNCONFDIR}/${_kernel}
1019	.endif	1019	.endif




#include <assert.h>
#include <ctype.h>
#include <err.h>
#include <stdlib.h>
#include <string.h>
#include "y.tab.h"
#include "config.h"

	FILE *fp;
	struct incl *in;
	char *fnamebuf;
	char *kernconfdir;

	fnamebuf = NULL;
	fp = fopen(fname, "r");

		}
	}
	if (fp == NULL) {
		kernconfdir = getenv("KERNCONFDIR");
		if (kernconfdir != NULL) {
			asprintf(&fnamebuf, "%s/%s", kernconfdir, fname);
			if (fnamebuf != NULL) {
				fp = fopen(fnamebuf, "r");
				free(fnamebuf);
			}
		}
	}
	if (fp == NULL) {
		yyerror("cannot open included file");
		return (-1);
	}

Return to bug 187712

Lines 34-39 Link Here

(-)usr.sbin/config/lang.l (+12 lines)
34	#include <assert.h>	34	#include <assert.h>
35	#include <ctype.h>	35	#include <ctype.h>
36	#include <err.h>	36	#include <err.h>
		37	#include <stdlib.h>
37	#include <string.h>	38	#include <string.h>
38	#include "y.tab.h"	39	#include "y.tab.h"
39	#include "config.h"	40	#include "config.h"
Lines 258-263 Link Here
258	FILE *fp;	259	FILE *fp;
259	struct incl *in;	260	struct incl *in;
260	char *fnamebuf;	261	char *fnamebuf;
		262	char *kernconfdir;
261		263
262	fnamebuf = NULL;	264	fnamebuf = NULL;
263	fp = fopen(fname, "r");	265	fp = fopen(fname, "r");
Lines 269-274 Link Here
269	}	271	}
270	}	272	}
271	if (fp == NULL) {	273	if (fp == NULL) {
		274	kernconfdir = getenv("KERNCONFDIR");
		275	if (kernconfdir != NULL) {
		276	asprintf(&fnamebuf, "%s/%s", kernconfdir, fname);
		277	if (fnamebuf != NULL) {
		278	fp = fopen(fnamebuf, "r");
		279	free(fnamebuf);
		280	}
		281	}
		282	}
		283	if (fp == NULL) {
272	yyerror("cannot open included file");	284	yyerror("cannot open included file");
273	return (-1);	285	return (-1);
274	}	286	}