Date: Wed, 28 Dec 2011 23:51:17 +0000 (UTC) From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228943 - in head: bin/sh tools/regression/bin/sh/builtins Message-ID: <201112282351.pBSNpHIK030325@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jilles Date: Wed Dec 28 23:51:17 2011 New Revision: 228943 URL: http://svn.freebsd.org/changeset/base/228943 Log: sh: Allow quoting ^ and ] in bracket expressions. Added: head/tools/regression/bin/sh/builtins/case13.0 (contents, props changed) Modified: head/bin/sh/mksyntax.c Modified: head/bin/sh/mksyntax.c ============================================================================== --- head/bin/sh/mksyntax.c Wed Dec 28 23:40:46 2011 (r228942) +++ head/bin/sh/mksyntax.c Wed Dec 28 23:51:17 2011 (r228943) @@ -219,16 +219,16 @@ main(int argc __unused, char **argv __un add("`", "CBQUOTE"); add("$", "CVAR"); add("}", "CENDVAR"); - /* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */ - add("!*?[=~:/-", "CCTL"); + /* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */ + add("!*?[]=~:/-^", "CCTL"); print("dqsyntax"); init(); fputs("\n/* syntax table used when in single quotes */\n", cfile); add("\n", "CNL"); add("\\", "CSBACK"); add("'", "CENDQUOTE"); - /* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */ - add("!*?[=~:/-", "CCTL"); + /* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */ + add("!*?[]=~:/-^", "CCTL"); print("sqsyntax"); init(); fputs("\n/* syntax table used when in arithmetic */\n", cfile); Added: head/tools/regression/bin/sh/builtins/case13.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/builtins/case13.0 Wed Dec 28 23:51:17 2011 (r228943) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +case ^ in +[\^^]) ;; +*) echo Failed at $LINENO ;; +esac + +case s in +[\^^]) echo Failed at $LINENO ;; +[s\]]) ;; +*) echo Failed at $LINENO ;; +esac
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112282351.pBSNpHIK030325>