Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): fix shell definition for csh



details:   https://anonhg.NetBSD.org/src/rev/f9507b5eefe6
branches:  trunk
changeset: 976765:f9507b5eefe6
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Oct 03 15:28:37 2020 +0000

description:
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.

diffstat:

 usr.bin/make/job.c                    |  6 +++---
 usr.bin/make/unit-tests/shell-csh.exp |  2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 6d6f7441dec2 -r f9507b5eefe6 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sat Oct 03 15:23:42 2020 +0000
+++ b/usr.bin/make/job.c        Sat Oct 03 15:28:37 2020 +0000
@@ -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 @@
      */
 {
     "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",
 },
diff -r 6d6f7441dec2 -r f9507b5eefe6 usr.bin/make/unit-tests/shell-csh.exp
--- a/usr.bin/make/unit-tests/shell-csh.exp     Sat Oct 03 15:23:42 2020 +0000
+++ b/usr.bin/make/unit-tests/shell-csh.exp     Sat Oct 03 15:28:37 2020 +0000
@@ -1,10 +1,8 @@
 echo normal
 normal
-se
 hidden
 echo always
 always
-se
 echo ignore errors
 ignore errors
 exit status 0



Home | Main Index | Thread Index | Old Index