Module Name: src
Committed By: rillig
Date: Tue Oct 27 07:16:27 UTC 2020
Modified Files:
src/usr.bin/make: main.c var.c
Log Message:
make(1): initialize all CmdOpts fiels
To generate a diff of this commit:
cvs rdiff -u -r1.395 -r1.396 src/usr.bin/make/main.c
cvs rdiff -u -r1.590 -r1.591 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.395 src/usr.bin/make/main.c:1.396
--- src/usr.bin/make/main.c:1.395 Tue Oct 27 07:13:02 2020
+++ src/usr.bin/make/main.c Tue Oct 27 07:16:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.395 2020/10/27 07:13:02 rillig Exp $ */
+/* $NetBSD: main.c,v 1.396 2020/10/27 07:16:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -118,7 +118,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.395 2020/10/27 07:13:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.396 2020/10/27 07:16:27 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1067,7 +1067,7 @@ CmdOpts_Init(void)
opts.debug = 0; /* No debug verbosity, please. */
/* opts.debug_file has been initialized earlier */
opts.debugVflag = FALSE;
- /* TODO: checkEnvFirst = FALSE; */
+ opts.checkEnvFirst = FALSE;
opts.makefiles = Lst_New();
opts.ignoreErrors = FALSE; /* Pay attention to non-zero returns */
opts.maxJobs = DEFMAXLOCAL; /* Set default local max concurrency */
@@ -1080,9 +1080,9 @@ CmdOpts_Init(void)
opts.touchFlag = FALSE; /* Actually update targets */
opts.printVars = 0;
opts.variables = Lst_New();
- /* TODO: parseWarnFatal = FALSE; */
- /* TODO: enterFlag = FALSE; */
- /* TODO: varNoExportEnv = FALSE; */
+ opts.parseWarnFatal = FALSE;
+ opts.enterFlag = FALSE;
+ opts.varNoExportEnv = FALSE;
opts.create = Lst_New();
}
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.590 src/usr.bin/make/var.c:1.591
--- src/usr.bin/make/var.c:1.590 Mon Oct 26 21:34:10 2020
+++ src/usr.bin/make/var.c Tue Oct 27 07:16:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.590 2020/10/26 21:34:10 rillig Exp $ */
+/* $NetBSD: var.c,v 1.591 2020/10/27 07:16:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -121,7 +121,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.590 2020/10/26 21:34:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.591 2020/10/27 07:16:27 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -176,7 +176,7 @@ static Boolean save_dollars = TRUE;
* list. On this list are located the structures describing such
* local variables as $(@) and $(*)
* The four contexts are searched in the reverse order from which they are
- * listed (but see checkEnvFirst).
+ * listed (but see opts.checkEnvFirst).
*/
GNode *VAR_INTERNAL; /* variables from make itself */
GNode *VAR_GLOBAL; /* variables from the makefile */
