 @@ -1,14 +1,14 @@
-/*	$NetBSD: job.c,v 1.298 2020/11/01 16:57:02 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.299 2020/11/01 17:07:03 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -133,27 +133,27 @@
 #ifndef USE_SELECT
 #include <poll.h>
 #endif
 #include <signal.h>
 #include <utime.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 #include "trace.h"
 /*	"@(#)job.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: job.c,v 1.298 2020/11/01 16:57:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.299 2020/11/01 17:07:03 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
  * the commands from it.  The commands are written to the file using a few
  * templates for echo control and error control.
+ *
  * The name of the shell is the basename for the predefined shells, such as
  * "sh", "csh", "bash".  For custom shells, it is the full pathname, and its
  * basename is used to select the type of shell; the longest match wins.
  * So /usr/pkg/bin/bash has type sh, /usr/local/bin/tcsh has type csh.
+ *
  * The echoing of command lines is controlled using hasEchoCtl, echoOff,
  * echoOn, noPrint and noPrintLen.  When echoOff is executed by the shell, it
 @@ -664,26 +664,44 @@ ParseRunOptions(
 	    *out_errOff = TRUE;
 	else if (*p == '+')
 	    *out_runAlways = TRUE;
 	else
 	    break;
 	p++;
+    }
     pp_skip_whitespace(&p);
     *pp = p;
+}
 /* Escape a string for a double-quoted string literal in sh, csh and ksh. */
 static char *
 EscapeShellDblQuot(const char *cmd)
+{
     size_t i, j;
     /* Worst that could happen is every char needs escaping. */
     char *esc = bmake_malloc(strlen(cmd) * 2 + 1);
     for (i = 0, j = 0; cmd[i] != '\0'; i++, j++) {
 	if (cmd[i] == '$' || cmd[i] == '`' || cmd[i] == '\\' || cmd[i] == '"')
 	    esc[j++] = '\\';
 	esc[j] = cmd[i];
+    }
     esc[j] = '\0';
     return esc;
+}
 /*-
  *-----------------------------------------------------------------------
  * JobPrintCommand  --
  *	Put out another command for the given job. If the command starts
  *	with an @ or a - we process it specially. In the former case,
  *	so long as the -s and -n flags weren't given to make, we stick
  *	a shell-specific echoOff command in the script. In the latter,
  *	we ignore errors for the entire job, unless the shell has error
  *	control.
  *	If the command is just "..." we take all future commands for this
  *	job to be commands to be executed once the entire graph has been
  *	made and return non-zero to signal that the end of the commands
  *	was reached. These commands are later attached to the postCommands
 @@ -737,39 +755,28 @@ JobPrintCommand(Job *job, char *cmd)
 	 * but this one needs to be - use compat mode just for it.
 	 */
 	Compat_RunCommand(cmdp, job->node);
 	free(cmdStart);
 	return;
+    }
     /*
      * If the shell doesn't have error control the alternate echo'ing will
      * be done (to avoid showing additional error checking code)
      * and this will need the characters '$ ` \ "' escaped
      */
-    if (!commandShell->hasErrCtl) {
+    if (!commandShell->hasErrCtl)
-	int i, j;
+        escCmd = EscapeShellDblQuot(cmd);
 	/* Worst that could happen is every char needs escaping. */
 	escCmd = bmake_malloc((strlen(cmd) * 2) + 1);
 	for (i = 0, j = 0; cmd[i] != '\0'; i++, j++) {
 	    if (cmd[i] == '$' || cmd[i] == '`' || cmd[i] == '\\' ||
 		cmd[i] == '"')
 		escCmd[j++] = '\\';
 	    escCmd[j] = cmd[i];
 	escCmd[j] = '\0';
     if (shutUp) {
 	if (!(job->flags & JOB_SILENT) && !noSpecials &&
 	    commandShell->hasEchoCtl) {
 		DBPRINTF("%s\n", commandShell->echoOff);
 	} else {
 	    if (commandShell->hasErrCtl)
 		shutUp = FALSE;
+	}
+    }
     if (errOff) {
 	if (!noSpecials) {