Module Name: src
Committed By: rillig
Date: Sun Nov 8 01:16:04 UTC 2020
Modified Files:
src/usr.bin/make: job.c job.h
Log Message:
make(1): remove unused JOB_IGNDOTS
It had been used in 1993 at least, don't know when it was finally
removed.
To generate a diff of this commit:
cvs rdiff -u -r1.313 -r1.314 src/usr.bin/make/job.c
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/make/job.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/job.c
diff -u src/usr.bin/make/job.c:1.313 src/usr.bin/make/job.c:1.314
--- src/usr.bin/make/job.c:1.313 Sun Nov 8 01:07:00 2020
+++ src/usr.bin/make/job.c Sun Nov 8 01:16:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.313 2020/11/08 01:07:00 rillig Exp $ */
+/* $NetBSD: job.c,v 1.314 2020/11/08 01:16:04 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.313 2020/11/08 01:07:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.314 2020/11/08 01:16:04 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -900,12 +900,11 @@ JobPrintCommands(Job *job)
if (strcmp(cmd, "...") == 0) {
job->node->type |= OP_SAVE_CMDS;
- if (!(job->flags & JOB_IGNDOTS)) {
- job->tailCmds = ln->next;
- break;
- }
- } else
- JobPrintCommand(job, ln->datum);
+ job->tailCmds = ln->next;
+ break;
+ }
+
+ JobPrintCommand(job, ln->datum);
}
}
@@ -1473,7 +1472,6 @@ JobMakeArgv(Job *job, char **argv)
* Input:
* gn target to create
* flags flags for the job to override normal ones.
- * e.g. JOB_SPECIAL or JOB_IGNDOTS
* previous The previous Job structure for this node, if any.
*
* Results:
@@ -1485,9 +1483,7 @@ JobMakeArgv(Job *job, char **argv)
* A new Job node is created and added to the list of running
* jobs. PMake is forked and a child shell created.
*
- * NB: I'm fairly sure that this code is never called with JOB_SPECIAL set
- * JOB_IGNDOTS is never set (dsl)
- * Also the return value is ignored by everyone.
+ * NB: The return value is ignored by everyone.
*-----------------------------------------------------------------------
*/
static JobStartResult
Index: src/usr.bin/make/job.h
diff -u src/usr.bin/make/job.h:1.60 src/usr.bin/make/job.h:1.61
--- src/usr.bin/make/job.h:1.60 Sat Nov 7 21:24:33 2020
+++ src/usr.bin/make/job.h Sun Nov 8 01:16:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.h,v 1.60 2020/11/07 21:24:33 rillig Exp $ */
+/* $NetBSD: job.h,v 1.61 2020/11/08 01:16:04 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -134,8 +134,6 @@ typedef enum JobFlags {
/* Target is a special one. i.e. run it locally
* if we can't export it and maxLocal is 0 */
JOB_SPECIAL = 1 << 2,
- /* Ignore "..." lines when processing commands */
- JOB_IGNDOTS = 1 << 3,
/* we've sent 'set -x' */
JOB_TRACED = 1 << 10
} JobFlags;
