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

make(1): inline ShellWriter_PrintCmd

Browse Source 
The parameter name escCmd was wrong for the call in JobPrintCommand.
This commit is contained in:
rillig 2020-12-12 10:45:24 +00:00
parent 1702e7bd48
commit e924b5d63d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: job.c,v 1.375 2020/12/12 10:40:42 rillig Exp $ */
/* $NetBSD: job.c,v 1.376 2020/12/12 10:45:24 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.375 2020/12/12 10:40:42 rillig Exp $");
MAKE_RCSID("$NetBSD: job.c,v 1.376 2020/12/12 10:45:24 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@ -763,12 +763,6 @@ ShellWriter_PrintFmt(ShellWriter *wr, const char *fmt, const char *arg)
(void)fflush(wr->f);
}
static void
ShellWriter_PrintCmd(ShellWriter *wr, const char *tmpl, const char *escCmd)
{
ShellWriter_PrintFmt(wr, tmpl, escCmd);
}
static void
ShellWriter_Println(ShellWriter *wr, const char *line)
{
@ -785,7 +779,7 @@ ShellWriter_EchoOff(ShellWriter *wr)
static void
ShellWriter_EchoCmd(ShellWriter *wr, const char *escCmd)
{
ShellWriter_PrintCmd(wr, shell->echoTmpl, escCmd);
ShellWriter_PrintFmt(wr, shell->echoTmpl, escCmd);
}
static void
@ -965,7 +959,7 @@ JobPrintCommand(Job *job, ShellWriter *wr, const char *ucmd)
if (DEBUG(SHELL) && strcmp(shellName, "sh") == 0)
ShellWriter_TraceOn(wr);
ShellWriter_PrintCmd(wr, cmdTemplate, xcmd);
ShellWriter_PrintFmt(wr, cmdTemplate, xcmd);
free(xcmdStart);
free(escCmd);
if (cmdFlags.ignerr) {