From owner-svn-src-head@FreeBSD.ORG Mon Aug 16 17:18:09 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5636C1065674; Mon, 16 Aug 2010 17:18:09 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 43D788FC14; Mon, 16 Aug 2010 17:18:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7GHI9gw004685; Mon, 16 Aug 2010 17:18:09 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7GHI9ne004674; Mon, 16 Aug 2010 17:18:09 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201008161718.o7GHI9ne004674@svn.freebsd.org> From: Jilles Tjoelker Date: Mon, 16 Aug 2010 17:18:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211399 - in head/tools/regression/bin/sh: builtins execution set-e X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 16 Aug 2010 17:18:09 -0000 Author: jilles Date: Mon Aug 16 17:18:08 2010 New Revision: 211399 URL: http://svn.freebsd.org/changeset/base/211399 Log: sh: Get rid of unnecessary non-standard empty lists. POSIX does not allow constructs like: if cmd; then fi { } Add a colon dummy command, except in a test that verifies that such empty lists do not cause crashes when used as a function definition. Modified: head/tools/regression/bin/sh/builtins/command3.0 head/tools/regression/bin/sh/builtins/command5.0 head/tools/regression/bin/sh/builtins/command6.0 head/tools/regression/bin/sh/execution/func2.0 head/tools/regression/bin/sh/set-e/elif1.0 head/tools/regression/bin/sh/set-e/elif2.0 head/tools/regression/bin/sh/set-e/if1.0 head/tools/regression/bin/sh/set-e/if3.0 head/tools/regression/bin/sh/set-e/while1.0 head/tools/regression/bin/sh/set-e/while2.0 Modified: head/tools/regression/bin/sh/builtins/command3.0 ============================================================================== --- head/tools/regression/bin/sh/builtins/command3.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/builtins/command3.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -4,6 +4,7 @@ command -v true command -v /bin/ls fun() { + : } command -v fun command -v break Modified: head/tools/regression/bin/sh/builtins/command5.0 ============================================================================== --- head/tools/regression/bin/sh/builtins/command5.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/builtins/command5.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -4,6 +4,7 @@ command -V true command -V /bin/ls fun() { + : } command -V fun command -V break Modified: head/tools/regression/bin/sh/builtins/command6.0 ============================================================================== --- head/tools/regression/bin/sh/builtins/command6.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/builtins/command6.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -5,6 +5,7 @@ command -pV true command -pV /bin/ls fun() { + : } command -pV fun command -pV break Modified: head/tools/regression/bin/sh/execution/func2.0 ============================================================================== --- head/tools/regression/bin/sh/execution/func2.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/execution/func2.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -1,4 +1,5 @@ # $FreeBSD$ +# The empty pairs of braces here are to test that this does not cause a crash. f() { } f Modified: head/tools/regression/bin/sh/set-e/elif1.0 ============================================================================== --- head/tools/regression/bin/sh/set-e/elif1.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/set-e/elif1.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -1,5 +1,7 @@ # $FreeBSD$ set -e if false; then + : elif false; then + : fi Modified: head/tools/regression/bin/sh/set-e/elif2.0 ============================================================================== --- head/tools/regression/bin/sh/set-e/elif2.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/set-e/elif2.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -1,5 +1,7 @@ # $FreeBSD$ set -e if false; then + : elif false; false; then + : fi Modified: head/tools/regression/bin/sh/set-e/if1.0 ============================================================================== --- head/tools/regression/bin/sh/set-e/if1.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/set-e/if1.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -1,4 +1,5 @@ # $FreeBSD$ set -e if false; then + : fi Modified: head/tools/regression/bin/sh/set-e/if3.0 ============================================================================== --- head/tools/regression/bin/sh/set-e/if3.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/set-e/if3.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -1,4 +1,5 @@ # $FreeBSD$ set -e if false; false; then + : fi Modified: head/tools/regression/bin/sh/set-e/while1.0 ============================================================================== --- head/tools/regression/bin/sh/set-e/while1.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/set-e/while1.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -1,4 +1,5 @@ # $FreeBSD$ set -e while false; do + : done Modified: head/tools/regression/bin/sh/set-e/while2.0 ============================================================================== --- head/tools/regression/bin/sh/set-e/while2.0 Mon Aug 16 15:51:41 2010 (r211398) +++ head/tools/regression/bin/sh/set-e/while2.0 Mon Aug 16 17:18:08 2010 (r211399) @@ -1,4 +1,5 @@ # $FreeBSD$ set -e while false; false; do + : done