[src/netbsd-9]: src/sys/ddb Pull up following revision(s) (requested by riast...

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

details:   https://anonhg.NetBSD.org/src/rev/3d1aea37d7fd
branches:  netbsd-9
changeset: 745400:3d1aea37d7fd
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Mar 01 12:45:09 2020 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #746):

        sys/ddb/db_lex.c: revision 1.25

Fix crash(8).  Will revisit.

diffstat:

 sys/ddb/db_lex.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 54a30d29367d -r 3d1aea37d7fd sys/ddb/db_lex.c
--- a/sys/ddb/db_lex.c  Sun Mar 01 12:38:59 2020 +0000
+++ b/sys/ddb/db_lex.c  Sun Mar 01 12:45:09 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_lex.c,v 1.22.60.1 2020/01/26 11:25:22 martin Exp $  */
+/*     $NetBSD: db_lex.c,v 1.22.60.2 2020/03/01 12:45:09 martin Exp $  */
 
 /*
  * Mach Operating System
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_lex.c,v 1.22.60.1 2020/01/26 11:25:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_lex.c,v 1.22.60.2 2020/03/01 12:45:09 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,11 +62,18 @@
 {
        int     i;
 
+#ifdef _KERNEL
+       /*
+        * crash(8) prints the prompt using libedit.  That's why we used to
+        * print it in db_readline().  But now people are using db_read_line()
+        * for general purpose input, so..
+        */
 #ifdef MULTIPROCESSOR
        db_printf("db{%ld}> ", (long)cpu_number());
 #else
        db_printf("db> ");
 #endif
+#endif
        i = db_readline(db_line, sizeof(db_line));
        if (i == 0)
                return (0);     /* EOI */