From owner-svn-src-head@freebsd.org Tue Feb 23 22:44:02 2016 Return-Path: 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 E73B1AB2BD2; Tue, 23 Feb 2016 22:44:02 +0000 (UTC) (envelope-from jilles@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 9F704B73; Tue, 23 Feb 2016 22:44:02 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1NMi1NS063434; Tue, 23 Feb 2016 22:44:01 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1NMi1uk063430; Tue, 23 Feb 2016 22:44:01 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201602232244.u1NMi1uk063430@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Tue, 23 Feb 2016 22:44:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295937 - in head/bin/sh: . tests/parser 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.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2016 22:44:03 -0000 Author: jilles Date: Tue Feb 23 22:44:01 2016 New Revision: 295937 URL: https://svnweb.freebsd.org/changeset/base/295937 Log: sh: Fix set -v and multiline history after r295825. r295825 erroneously dropped the newline from the input data for 'set -v' output and multiline history. Reported by: vangyzen Added: head/bin/sh/tests/parser/set-v1.0 (contents, props changed) head/bin/sh/tests/parser/set-v1.0.stderr (contents, props changed) Modified: head/bin/sh/input.c head/bin/sh/tests/parser/Makefile Modified: head/bin/sh/input.c ============================================================================== --- head/bin/sh/input.c Tue Feb 23 22:30:45 2016 (r295936) +++ head/bin/sh/input.c Tue Feb 23 22:44:01 2016 (r295937) @@ -242,7 +242,8 @@ again: parsenleft = parselleft; parselleft = 0; } else /* *q == '\n' */ { - parsenleft = q - parsenextc + 1; + q++; + parsenleft = q - parsenextc; parselleft -= parsenleft; } parsenleft--; Modified: head/bin/sh/tests/parser/Makefile ============================================================================== --- head/bin/sh/tests/parser/Makefile Tue Feb 23 22:30:45 2016 (r295936) +++ head/bin/sh/tests/parser/Makefile Tue Feb 23 22:44:01 2016 (r295937) @@ -79,6 +79,7 @@ FILES+= only-redir2.0 FILES+= only-redir3.0 FILES+= only-redir4.0 FILES+= pipe-not1.0 +FILES+= set-v1.0 set-v1.0.stderr FILES+= var-assign1.0 .include Added: head/bin/sh/tests/parser/set-v1.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/parser/set-v1.0 Tue Feb 23 22:44:01 2016 (r295937) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +${SH} <<\EOF +echo one >&2 +set -v +echo two >&2 +echo three >&2 +EOF Added: head/bin/sh/tests/parser/set-v1.0.stderr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/parser/set-v1.0.stderr Tue Feb 23 22:44:01 2016 (r295937) @@ -0,0 +1,5 @@ +one +echo two >&2 +two +echo three >&2 +three