Module Name: src
Committed By: rillig
Date: Sun Nov 8 01:00:25 UTC 2020
Modified Files:
src/usr.bin/make: job.c
Log Message:
make(1): fix indentation in JobExec
To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/usr.bin/make/job.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/job.c
diff -u src/usr.bin/make/job.c:1.311 src/usr.bin/make/job.c:1.312
--- src/usr.bin/make/job.c:1.311 Sun Nov 8 00:54:06 2020
+++ src/usr.bin/make/job.c Sun Nov 8 01:00:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.311 2020/11/08 00:54:06 rillig Exp $ */
+/* $NetBSD: job.c,v 1.312 2020/11/08 01:00:25 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.311 2020/11/08 00:54:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.312 2020/11/08 01:00:25 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
@@ -1272,7 +1272,7 @@ static void
JobExec(Job *job, char **argv)
{
int cpid; /* ID of new child */
- sigset_t mask;
+ sigset_t mask;
job->flags &= ~JOB_TRACED;
@@ -1340,13 +1340,13 @@ JobExec(Job *job, char **argv)
execDie("lseek to 0", "stdin");
if (job->node->type & (OP_MAKE | OP_SUBMAKE)) {
- /*
- * Pass job token pipe to submakes.
- */
- if (fcntl(tokenWaitJob.inPipe, F_SETFD, 0) == -1)
- execDie("clear close-on-exec", "tokenWaitJob.inPipe");
- if (fcntl(tokenWaitJob.outPipe, F_SETFD, 0) == -1)
- execDie("clear close-on-exec", "tokenWaitJob.outPipe");
+ /*
+ * Pass job token pipe to submakes.
+ */
+ if (fcntl(tokenWaitJob.inPipe, F_SETFD, 0) == -1)
+ execDie("clear close-on-exec", "tokenWaitJob.inPipe");
+ if (fcntl(tokenWaitJob.outPipe, F_SETFD, 0) == -1)
+ execDie("clear close-on-exec", "tokenWaitJob.outPipe");
}
/*
