Module Name: src
Committed By: rillig
Date: Sat Oct 3 15:28:37 UTC 2020
Modified Files:
src/usr.bin/make: job.c
src/usr.bin/make/unit-tests: shell-csh.exp
Log Message:
make(1): fix shell definition for csh
The bug has been there since at least 1993-03-21. This is strong
evidence that nobody has ever used the csh in parallel mode.
To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/usr.bin/make/job.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/shell-csh.exp
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.255 src/usr.bin/make/job.c:1.256
--- src/usr.bin/make/job.c:1.255 Sat Oct 3 15:00:57 2020
+++ src/usr.bin/make/job.c Sat Oct 3 15:28:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.255 2020/10/03 15:00:57 rillig Exp $ */
+/* $NetBSD: job.c,v 1.256 2020/10/03 15:28:37 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.255 2020/10/03 15:00:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.256 2020/10/03 15:28:37 rillig Exp $");
# define STATIC static
@@ -264,7 +264,7 @@ static Shell shells[] = {
*/
{
"csh",
- TRUE, "unset verbose", "set verbose", "unset verbose", 10,
+ TRUE, "unset verbose", "set verbose", "unset verbose", 13,
FALSE, "echo \"%s\"\n", "csh -c \"%s || exit 0\"\n", "", "'\\\n'", '#',
"v", "e",
},
Index: src/usr.bin/make/unit-tests/shell-csh.exp
diff -u src/usr.bin/make/unit-tests/shell-csh.exp:1.3 src/usr.bin/make/unit-tests/shell-csh.exp:1.4
--- src/usr.bin/make/unit-tests/shell-csh.exp:1.3 Sat Oct 3 15:23:42 2020
+++ src/usr.bin/make/unit-tests/shell-csh.exp Sat Oct 3 15:28:37 2020
@@ -1,10 +1,8 @@
echo normal
normal
-se
hidden
echo always
always
-se
echo ignore errors
ignore errors
exit status 0
