[src/trunk]: src/bin/sh DEBUG only changes (non-debug, ie: normal, shell unaf...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5cb985c7f7de
branches:  trunk
changeset: 826794:5cb985c7f7de
user:      kre <kre%NetBSD.org@localhost>
date:      Fri Sep 29 17:53:57 2017 +0000

description:
DEBUG only changes (non-debug, ie: normal, shell unaffected)
Add a little extra info in a few of the trace messages.

diffstat:

 bin/sh/eval.c |  12 +++++++-----
 bin/sh/jobs.c |   8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diffs (83 lines):

diff -r 0c6102aaf0b7 -r 5cb985c7f7de bin/sh/eval.c
--- a/bin/sh/eval.c     Fri Sep 29 17:47:29 2017 +0000
+++ b/bin/sh/eval.c     Fri Sep 29 17:53:57 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eval.c,v 1.151 2017/06/30 23:01:21 kre Exp $   */
+/*     $NetBSD: eval.c,v 1.152 2017/09/29 17:53:57 kre Exp $   */
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c     8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.151 2017/06/30 23:01:21 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.152 2017/09/29 17:53:57 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1056,7 +1056,8 @@
        /* Execute the command. */
        switch (cmdentry.cmdtype) {
        case CMDFUNCTION:
-               VXTRACE(DBG_EVAL, ("Shell function:  "), trargs(argv));
+               VXTRACE(DBG_EVAL, ("Shell function%s:  ",vforked?" VF":""),
+                   trargs(argv));
                redirect(cmd->ncmd.redirect, flags & EV_MORE ? REDIR_PUSH : 0);
                saveparam = shellparam;
                shellparam.malloc = 0;
@@ -1126,7 +1127,7 @@
 
        case CMDBUILTIN:
        case CMDSPLBLTIN:
-               VXTRACE(DBG_EVAL, ("builtin command:  "), trargs(argv));
+               VXTRACE(DBG_EVAL, ("builtin command%s:  ",vforked?" VF":""), trargs(argv));
                mode = (cmdentry.u.bltin == execcmd) ? 0 : REDIR_PUSH;
                if (flags == EV_BACKCMD) {
                        memout.nleft = 0;
@@ -1204,7 +1205,8 @@
                break;
 
        default:
-               VXTRACE(DBG_EVAL, ("normal command:  "), trargs(argv));
+               VXTRACE(DBG_EVAL, ("normal command%s:  ", vforked?" VF":""),
+                   trargs(argv));
                redirect(cmd->ncmd.redirect, 
                    (vforked ? REDIR_VFORK : 0) | REDIR_KEEP);
                if (!vforked)
diff -r 0c6102aaf0b7 -r 5cb985c7f7de bin/sh/jobs.c
--- a/bin/sh/jobs.c     Fri Sep 29 17:47:29 2017 +0000
+++ b/bin/sh/jobs.c     Fri Sep 29 17:53:57 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jobs.c,v 1.88 2017/07/24 14:17:11 kre Exp $    */
+/*     $NetBSD: jobs.c,v 1.89 2017/09/29 17:53:57 kre Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)jobs.c     8.5 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: jobs.c,v 1.88 2017/07/24 14:17:11 kre Exp $");
+__RCSID("$NetBSD: jobs.c,v 1.89 2017/09/29 17:53:57 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -913,7 +913,7 @@
                if (/* iflag && rootshell && */ n)
                        commandtext(ps, n);
        }
-       CTRACE(DBG_JOBS, ("In parent shell:  child = %d\n", pid));
+       CTRACE(DBG_JOBS, ("In parent shell: child = %d (mode %d)\n",pid,mode));
        return pid;
 }
 
@@ -926,7 +926,7 @@
        const char *nullerr = "Can't open %s";
 
        wasroot = rootshell;
-       CTRACE(DBG_JOBS, ("Child shell %d\n", getpid()));
+       CTRACE(DBG_JOBS, ("Child shell %d%s\n",getpid(),vforked?" vforked":""));
        if (!vforked)
                rootshell = 0;