From owner-svn-src-head@freebsd.org  Tue Sep 27 20:40:45 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4529BEBD19;
 Tue, 27 Sep 2016 20:40:45 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A7516E66;
 Tue, 27 Sep 2016 20:40:45 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8RKei86081976;
 Tue, 27 Sep 2016 20:40:44 GMT (envelope-from tsoome@FreeBSD.org)
Received: (from tsoome@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8RKeiTZ081975;
 Tue, 27 Sep 2016 20:40:44 GMT (envelope-from tsoome@FreeBSD.org)
Message-Id: <201609272040.u8RKeiTZ081975@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tsoome set sender to
 tsoome@FreeBSD.org using -f
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Tue, 27 Sep 2016 20:40:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306380 - head/sys/boot/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2016 20:40:45 -0000

Author: tsoome
Date: Tue Sep 27 20:40:44 2016
New Revision: 306380
URL: https://svnweb.freebsd.org/changeset/base/306380

Log:
  loader command interpreter should reset command_errmsg
  
  The command interpreter does leave command_errmsg as is after printing its
  content, assuming the next command will reset it in bf_command(). However,
  in case the forth native word is defined as builtin, the bf_command is not
  used and forth words will also end up the command_errmsg content printed.
  
  Since command_errmsg is pointer to actual error message, which can be static
  read only string, we can not just set *command_errmsg = '\0', instead we need
  to reset the pointer itself.
  
  Illumos issue: https://www.illumos.org/issues/7405
  
  Reported by: Igor Kozhukhov.
  Reviewed by:	allanjude
  Approved by:	allanjude (mentor)
  Differential Revision:	https://reviews.freebsd.org/D8032

Modified:
  head/sys/boot/common/interp_forth.c

Modified: head/sys/boot/common/interp_forth.c
==============================================================================
--- head/sys/boot/common/interp_forth.c	Tue Sep 27 19:36:12 2016	(r306379)
+++ head/sys/boot/common/interp_forth.c	Tue Sep 27 20:40:44 2016	(r306380)
@@ -325,13 +325,15 @@ bf_run(char *line)
 	printf("Parse error!\n");
 	break;
     default:
-        /* Hopefully, all other codes filled this buffer */
-	printf("%s\n", command_errmsg);
+	if (command_errmsg != NULL) {
+	    printf("%s\n", command_errmsg);
+	    command_errmsg = NULL;
+	}
     }
     
     if (result == VM_USEREXIT)
 	panic("interpreter exit");
     setenv("interpret", bf_vm->state ? "" : "OK", 1);
 
-    return result;
+    return (result);
 }