[src/trunk]: src/sys/ddb only call the on-enter commands if we're not recursing.

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

details:   https://anonhg.NetBSD.org/src/rev/95a9937c2ae9
branches:  trunk
changeset: 808533:95a9937c2ae9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu May 21 08:23:22 2015 +0000

description:
only call the on-enter commands if we're not recursing.
avoids having a fault in the on-enter commands repeating.

diffstat:

 sys/ddb/db_command.c |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r cc1d5835ffd9 -r 95a9937c2ae9 sys/ddb/db_command.c
--- a/sys/ddb/db_command.c      Thu May 21 02:04:22 2015 +0000
+++ b/sys/ddb/db_command.c      Thu May 21 08:23:22 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_command.c,v 1.144 2015/02/08 19:41:39 christos Exp $        */
+/*     $NetBSD: db_command.c,v 1.145 2015/05/21 08:23:22 mrg Exp $     */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.144 2015/02/08 19:41:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.145 2015/05/21 08:23:22 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
@@ -549,8 +549,13 @@
        db_recover = &db_jmpbuf;
        (void) setjmp(&db_jmpbuf);
 
-       /* Execute default ddb start commands */
-       db_execute_commandlist(db_cmd_on_enter);
+       /*
+        * Execute default ddb start commands only if this is the
+        * first entry into DDB, in case the start commands fault
+        * and we recurse into here.
+        */
+       if (!savejmp)
+               db_execute_commandlist(db_cmd_on_enter);
 
        (void) setjmp(&db_jmpbuf);
        while (!db_cmd_loop_done) {