From owner-svn-src-head@freebsd.org Sun Mar 19 21:18:54 2017 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 6C1A2D12D78; Sun, 19 Mar 2017 21:18:54 +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 39450DF5; Sun, 19 Mar 2017 21:18:54 +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 v2JLIrLU034432; Sun, 19 Mar 2017 21:18:53 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2JLIrPj034431; Sun, 19 Mar 2017 21:18:53 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201703192118.v2JLIrPj034431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Sun, 19 Mar 2017 21:18:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315585 - head/bin/sh 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2017 21:18:54 -0000 Author: jilles Date: Sun Mar 19 21:18:53 2017 New Revision: 315585 URL: https://svnweb.freebsd.org/changeset/base/315585 Log: sh: Fix build with -DDEBUG=2. With the new expansion code (word splitting during instead of after other expansion processing), tracing the result of command substitution is no longer possible, so stop trying. Modified: head/bin/sh/expand.c Modified: head/bin/sh/expand.c ============================================================================== --- head/bin/sh/expand.c Sun Mar 19 20:51:28 2017 (r315584) +++ head/bin/sh/expand.c Sun Mar 19 21:18:53 2017 (r315585) @@ -522,10 +522,7 @@ expbackq(union node *cmd, int quoted, in exitstatus = waitforjob(in.jp, (int *)NULL); ungrabstackstr(p, dest); } - TRACE(("expbackq: size=%td: \"%.*s\"\n", - ((dest - stackblock()) - startloc), - (int)((dest - stackblock()) - startloc), - stackblock() + startloc)); + TRACE(("expbackq: done\n")); expdest = dest; INTON; }