From owner-svn-src-all@FreeBSD.ORG  Sun Apr 11 12:24:48 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0712B106564A;
	Sun, 11 Apr 2010 12:24:48 +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 E983E8FC18;
	Sun, 11 Apr 2010 12:24:47 +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 o3BCOlCS096041;
	Sun, 11 Apr 2010 12:24:47 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3BCOl4j096038;
	Sun, 11 Apr 2010 12:24:47 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201004111224.o3BCOl4j096038@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 11 Apr 2010 12:24:47 +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: r206473 - head/bin/sh
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Apr 2010 12:24:48 -0000

Author: jilles
Date: Sun Apr 11 12:24:47 2010
New Revision: 206473
URL: http://svn.freebsd.org/changeset/base/206473

Log:
  sh: Partially revert r206146, allowing double-quotes in arithmetic.
  
  These do pretty much nothing (except that parentheses are ignored), but
  people seem to use them and allowing them does not hurt much.
  
  Single-quotes seem not to be used and cause silently different behaviour
  with ksh93 character constants.

Modified:
  head/bin/sh/mksyntax.c
  head/bin/sh/parser.c

Modified: head/bin/sh/mksyntax.c
==============================================================================
--- head/bin/sh/mksyntax.c	Sun Apr 11 12:07:03 2010	(r206472)
+++ head/bin/sh/mksyntax.c	Sun Apr 11 12:24:47 2010	(r206473)
@@ -232,6 +232,7 @@ main(int argc __unused, char **argv __un
 	add("\n", "CNL");
 	add("\\", "CBACK");
 	add("`", "CBQUOTE");
+	add("\"", "CDQUOTE");
 	add("$", "CVAR");
 	add("}", "CENDVAR");
 	add("(", "CLP");

Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c	Sun Apr 11 12:07:03 2010	(r206472)
+++ head/bin/sh/parser.c	Sun Apr 11 12:24:47 2010	(r206473)
@@ -1223,7 +1223,10 @@ readtoken1(int firstc, char const *initi
 				if (eofmark != NULL && newvarnest == 0)
 					USTPUTC(c, out);
 				else {
-					state[level].syntax = BASESYNTAX;
+					if (state[level].category == TSTATE_ARITH)
+						state[level].syntax = ARISYNTAX;
+					else
+						state[level].syntax = BASESYNTAX;
 					quotef++;
 				}
 				break;