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: prefix the warning about read-only .OBJDI...



details:   https://anonhg.NetBSD.org/src/rev/e9ae7013368b
branches:  trunk
changeset: 361102:e9ae7013368b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Feb 09 20:52:06 2022 +0000

description:
make: prefix the warning about read-only .OBJDIR with a colon

For consistency with the other warnings.

diffstat:

 usr.bin/make/main.c                         |  6 +++---
 usr.bin/make/unit-tests/Makefile            |  3 +--
 usr.bin/make/unit-tests/objdir-writable.exp |  2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r fa38ea0b585f -r e9ae7013368b usr.bin/make/main.c
--- a/usr.bin/make/main.c       Wed Feb 09 18:54:19 2022 +0000
+++ b/usr.bin/make/main.c       Wed Feb 09 20:52:06 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.577 2022/01/29 09:38:26 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.578 2022/02/09 20:52:06 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.577 2022/01/29 09:38:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.578 2022/02/09 20:52:06 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -718,7 +718,7 @@
                return false;
 
        if ((writable && access(path, W_OK) != 0) || chdir(path) != 0) {
-               (void)fprintf(stderr, "%s warning: %s: %s.\n",
+               (void)fprintf(stderr, "%s: warning: %s: %s.\n",
                    progname, path, strerror(errno));
                return false;
        }
diff -r fa38ea0b585f -r e9ae7013368b usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Wed Feb 09 18:54:19 2022 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Wed Feb 09 20:52:06 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.304 2022/02/09 18:54:19 rillig Exp $
+# $NetBSD: Makefile,v 1.305 2022/02/09 20:52:06 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -688,7 +688,6 @@
 # always pretend .MAKE was called 'make'
 _SED_CMDS+=    -e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,'
 _SED_CMDS+=    -e 's,${TEST_MAKE:S,.,\\.,g},make,'
-_SED_CMDS+=    -e 's,${TEST_MAKE:T:S,.,\\.,g}[][0-9]* warning,make warning,'
 _SED_CMDS+=    -e 's,^usage: ${TEST_MAKE:T:S,.,\\.,g} ,usage: make ,'
 # replace anything after 'stopped in' with unit-tests
 _SED_CMDS+=    -e '/stopped/s, /.*, unit-tests,'
diff -r fa38ea0b585f -r e9ae7013368b usr.bin/make/unit-tests/objdir-writable.exp
--- a/usr.bin/make/unit-tests/objdir-writable.exp       Wed Feb 09 18:54:19 2022 +0000
+++ b/usr.bin/make/unit-tests/objdir-writable.exp       Wed Feb 09 20:52:06 2022 +0000
@@ -1,4 +1,4 @@
-make warning: <tmpdir>/roobj: Permission denied.
+make: warning: <tmpdir>/roobj: Permission denied.
 <tmpdir>
 <tmpdir>/roobj
 <tmpdir>/roobj



Home | Main Index | Thread Index | Old Index