Module Name: src
Committed By: rillig
Date: Fri Dec 11 23:01:00 UTC 2020
Modified Files:
src/usr.bin/make: main.c make.h
Log Message:
make(1): clean up comments for command line options
To generate a diff of this commit:
cvs rdiff -u -r1.493 -r1.494 src/usr.bin/make/main.c
cvs rdiff -u -r1.232 -r1.233 src/usr.bin/make/make.h
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.493 src/usr.bin/make/main.c:1.494
--- src/usr.bin/make/main.c:1.493 Fri Dec 11 22:48:31 2020
+++ src/usr.bin/make/main.c Fri Dec 11 23:00:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.493 2020/12/11 22:48:31 rillig Exp $ */
+/* $NetBSD: main.c,v 1.494 2020/12/11 23:00:59 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.493 2020/12/11 22:48:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.494 2020/12/11 23:00:59 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1116,8 +1116,8 @@ UnlimitFiles(void)
static void
CmdOpts_Init(void)
{
- opts.compatMake = FALSE; /* No compat mode */
- opts.debug = DEBUG_NONE; /* No debug verbosity, please. */
+ opts.compatMake = FALSE;
+ opts.debug = DEBUG_NONE;
/* opts.debug_file has been initialized earlier */
opts.lint = FALSE;
opts.debugVflag = FALSE;
@@ -1128,10 +1128,10 @@ CmdOpts_Init(void)
opts.keepgoing = FALSE; /* Stop on error */
opts.noRecursiveExecute = FALSE; /* Execute all .MAKE targets */
opts.noExecute = FALSE; /* Execute all commands */
- opts.queryFlag = FALSE; /* This is not just a check-run */
+ opts.queryFlag = FALSE;
opts.noBuiltins = FALSE; /* Read the built-in rules */
opts.beSilent = FALSE; /* Print commands as executed */
- opts.touchFlag = FALSE; /* Actually update targets */
+ opts.touchFlag = FALSE;
opts.printVars = PVM_NONE;
Lst_Init(&opts.variables);
opts.parseWarnFatal = FALSE;
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.232 src/usr.bin/make/make.h:1.233
--- src/usr.bin/make/make.h:1.232 Sun Dec 6 10:33:42 2020
+++ src/usr.bin/make/make.h Fri Dec 11 23:00:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.232 2020/12/06 10:33:42 rillig Exp $ */
+/* $NetBSD: make.h,v 1.233 2020/12/11 23:00:59 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -640,8 +640,8 @@ typedef struct CmdOpts {
* this is coordinated with the submakes */
int maxJobs;
- /* -k: if true, continue on unaffected portions of the graph when an
- * error occurs in one portion */
+ /* -k: if true and an error occurs while making a node, continue
+ * making nodes that do not depend on the erroneous node */
Boolean keepgoing;
/* -N: execute no commands from the targets */
