From owner-svn-src-head@FreeBSD.ORG Sat Dec 18 23:03:52 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 3BF6110656C3; Sat, 18 Dec 2010 23:03:52 +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 2A91B8FC14; Sat, 18 Dec 2010 23:03:52 +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 oBIN3q89035992; Sat, 18 Dec 2010 23:03:52 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBIN3qPD035989; Sat, 18 Dec 2010 23:03:52 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201012182303.oBIN3qPD035989@svn.freebsd.org> From: Jilles Tjoelker Date: Sat, 18 Dec 2010 23:03:52 +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: r216547 - in head: bin/sh tools/regression/bin/sh/expansion 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: Sat, 18 Dec 2010 23:03:52 -0000 Author: jilles Date: Sat Dec 18 23:03:51 2010 New Revision: 216547 URL: http://svn.freebsd.org/changeset/base/216547 Log: sh: arith: Disallow decimal constants starting with 0 (containing 8 or 9). Constants in arithmetic starting with 0 should be octal only. This avoids the following highly puzzling result: $ echo $((018-017)) 3 by making it an error instead. Added: head/tools/regression/bin/sh/expansion/arith8.0 (contents, props changed) Modified: head/bin/sh/arith_lex.l Modified: head/bin/sh/arith_lex.l ============================================================================== --- head/bin/sh/arith_lex.l Sat Dec 18 23:03:38 2010 (r216546) +++ head/bin/sh/arith_lex.l Sat Dec 18 23:03:51 2010 (r216547) @@ -74,12 +74,12 @@ int yylex(void); return ARITH_NUM; } -0[0-7]+ { +0[0-7]* { yylval.l_value = strtoarith_t(yytext, NULL, 8); return ARITH_NUM; } -[0-9]+ { +[1-9][0-9]* { yylval.l_value = strtoarith_t(yytext, NULL, 10); return ARITH_NUM; } Added: head/tools/regression/bin/sh/expansion/arith8.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/expansion/arith8.0 Sat Dec 18 23:03:51 2010 (r216547) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +v=$( (eval ': $((08))') 2>&1 >/dev/null) +[ $? -ne 0 ] && [ -n "$v" ]