d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Allow quoting ^ and ] in bracket expressions.

Browse Source
This commit is contained in:
Jilles Tjoelker 2011-12-28 23:51:17 +00:00
parent 6e8db49a44
commit 3a1b9c9e82
2 changed files with 16 additions and 4 deletions
bin/sh
mksyntax.c
tools/regression/bin/sh/builtins
case13.0

8
bin/sh/mksyntax.c

@ -219,16 +219,16 @@ main(int argc __unused, char **argv __unused)
add("`", "CBQUOTE"); add("`", "CBQUOTE");
add("$", "CVAR"); add("$", "CVAR");
add("}", "CENDVAR"); add("}", "CENDVAR");
/* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */ /* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */
add("!*?[=~:/-", "CCTL"); add("!*?[]=~:/-^", "CCTL");
print("dqsyntax"); print("dqsyntax");
init(); init();
fputs("\n/* syntax table used when in single quotes */\n", cfile); fputs("\n/* syntax table used when in single quotes */\n", cfile);
add("\n", "CNL"); add("\n", "CNL");
add("\\", "CSBACK"); add("\\", "CSBACK");
add("'", "CENDQUOTE"); add("'", "CENDQUOTE");
/* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */ /* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */
add("!*?[=~:/-", "CCTL"); add("!*?[]=~:/-^", "CCTL");
print("sqsyntax"); print("sqsyntax");
init(); init();
fputs("\n/* syntax table used when in arithmetic */\n", cfile); fputs("\n/* syntax table used when in arithmetic */\n", cfile);

12
tools/regression/bin/sh/builtins/case13.0 Normal file

@ -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