Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): fix grammar: setup -> set up

This commit is contained in:
rillig 2020-11-14 13:27:01 +00:00
parent f7446908e0
commit 75ee36445d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/make/job.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.c,v 1.318 2020/11/14 13:07:39 rillig Exp $ */ /* $NetBSD: job.c,v 1.319 2020/11/14 13:27:01 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -143,7 +143,7 @@
#include "trace.h" #include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */ /* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: job.c,v 1.318 2020/11/14 13:07:39 rillig Exp $"); MAKE_RCSID("$NetBSD: job.c,v 1.319 2020/11/14 13:27:01 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are /* 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 * written into a single file, which is then given to the shell to execute
@ -169,7 +169,7 @@ MAKE_RCSID("$NetBSD: job.c,v 1.318 2020/11/14 13:07:39 rillig Exp $");
* status. Finally errExit is a printf template for running the command and * status. Finally errExit is a printf template for running the command and
* causing the shell to exit on error. If any of these strings are empty when * causing the shell to exit on error. If any of these strings are empty when
* hasErrCtl is FALSE, the command will be executed anyway as is, and if it * hasErrCtl is FALSE, the command will be executed anyway as is, and if it
* causes an error, so be it. Any templates setup to echo the command will * causes an error, so be it. Any templates set up to echo the command will
* escape any '$ ` \ "' characters in the command string to avoid common * escape any '$ ` \ "' characters in the command string to avoid common
* problems with echo "%s\n" as a template. * problems with echo "%s\n" as a template.
* *
@ -846,7 +846,7 @@ JobPrintCommand(Job *job, char *cmd)
/* /*
* If errors are being checked and the shell doesn't have error control * If errors are being checked and the shell doesn't have error control
* but does supply an errExit template, then setup commands to run * but does supply an errExit template, then set up commands to run
* through it. * through it.
*/ */
@ -1513,7 +1513,7 @@ JobStart(GNode *gn, JobFlags flags)
memset(job, 0, sizeof *job); memset(job, 0, sizeof *job);
job->node = gn; job->node = gn;
job->tailCmds = NULL; job->tailCmds = NULL;
job->status = JOB_ST_SETUP; job->status = JOB_ST_SET_UP;
if (gn->type & OP_SPECIAL) if (gn->type & OP_SPECIAL)
flags |= JOB_SPECIAL; flags |= JOB_SPECIAL;

4
usr.bin/make/job.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.h,v 1.62 2020/11/14 12:38:06 rillig Exp $ */ /* $NetBSD: job.h,v 1.63 2020/11/14 13:27:01 rillig Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -119,7 +119,7 @@ struct pollfd;
typedef enum JobStatus { typedef enum JobStatus {
JOB_ST_FREE = 0, /* Job is available */ JOB_ST_FREE = 0, /* Job is available */
JOB_ST_SETUP = 1, /* Job is allocated but otherwise invalid */ JOB_ST_SET_UP = 1, /* Job is allocated but otherwise invalid */
/* XXX: What about the 2? */ /* XXX: What about the 2? */
JOB_ST_RUNNING = 3, /* Job is running, pid valid */ JOB_ST_RUNNING = 3, /* Job is running, pid valid */
JOB_ST_FINISHED = 4 /* Job is done (ie after SIGCHILD) */ JOB_ST_FINISHED = 4 /* Job is done (ie after SIGCHILD) */