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 indentation of source code



details:   https://anonhg.NetBSD.org/src/rev/4daf530f28cb
branches:  trunk
changeset: 956566:4daf530f28cb
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 01 18:45:49 2020 +0000

description:
make(1): fix indentation of source code

diffstat:

 usr.bin/make/job.c |  6 +++---
 usr.bin/make/var.c |  7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r c5c20297fe74 -r 4daf530f28cb usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sun Nov 01 18:19:54 2020 +0000
+++ b/usr.bin/make/job.c        Sun Nov 01 18:45:49 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.301 2020/11/01 17:58:17 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.302 2020/11/01 18:45:49 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.301 2020/11/01 17:58:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.302 2020/11/01 18:45:49 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
@@ -766,7 +766,7 @@
      */
 
     if (!commandShell->hasErrCtl)
-        escCmd = EscapeShellDblQuot(cmd);
+       escCmd = EscapeShellDblQuot(cmd);
 
     if (shutUp) {
        if (!(job->flags & JOB_SILENT) && !noSpecials &&
diff -r c5c20297fe74 -r 4daf530f28cb usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Nov 01 18:19:54 2020 +0000
+++ b/usr.bin/make/var.c        Sun Nov 01 18:45:49 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.635 2020/11/01 14:36:25 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.636 2020/11/01 18:45:49 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
 #include "metachar.h"
 
 /*     "@(#)var.c      8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.635 2020/11/01 14:36:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.636 2020/11/01 18:45:49 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2373,8 +2373,7 @@
     for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 0); p++) {
        if (*p == '\\' &&
            (p[1] == ':' || p[1] == st->endc || p[1] == st->startc)) {
-           if (!needSubst)
-               copy = TRUE;
+           copy = TRUE;
            p++;
            continue;
        }



Home | Main Index | Thread Index | Old Index