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

sed: treat '[' as ordinary character in 'y' command

Browse Source 
'y' does not handle bracket expressions, treat '[' as ordinary character
and do not apply bracket expression checks (GNU sed agrees).

PR:		247931
Reviewed by:	pfg, kevans
Tested by:	antoine (exp-run), Quentin L'Hours <lhoursquentin@gmail.com>
Differential Revision:	https://reviews.freebsd.org/D25640
This commit is contained in:
Yuri Pankov 2020-07-26 09:15:05 +00:00
parent 18a48314ba
commit 14fdf16371
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/sed/compile.c
View File

@ -437,10 +437,18 @@ compile_delimited(char *p, char *d, int is_tr)
linenum, fname);
while (*p) {
if (*p == '[' && *p != c) {
if ((d = compile_ccl(&p, d)) == NULL)
errx(1, "%lu: %s: unbalanced brackets ([])", linenum, fname);
if (!is_tr) {
if ((d = compile_ccl(&p, d)) == NULL) {
errx(1,
"%lu: %s: unbalanced brackets ([])",
linenum, fname);
}
continue;
}
} else if (*p == '\\' && p[1] == '[') {
if (is_tr)
p++;
else
*d++ = *p++;
} else if (*p == '\\' && p[1] == c) {
p++;

17
usr.bin/sed/tests/sed2_test.sh
View File

@ -134,6 +134,22 @@ commands_on_stdin_body()
atf_check -o 'empty' sed -f - < insert_x
}
atf_test_case bracket_y
bracket_y_head()
{
atf_set "descr" "Verify '[' is ordinary character for 'y' command"
}
bracket_y_body()
{
atf_check -e empty -o ignore echo | sed 'y/[/x/'
atf_check -e empty -o ignore echo | sed 'y/[]/xy/'
atf_check -e empty -o ignore echo | sed 'y/[a]/xyz/'
atf_check -e empty -o "inline:zyx" echo '][a' | sed 'y/[a]/xyz/'
atf_check -e empty -o "inline:bracket\n" echo 'bra[ke]' | sed 'y/[]/ct/'
atf_check -e empty -o "inline:bracket\n" \
echo 'bra[ke]' | sed 'y[\[][ct['
}
atf_init_test_cases()
{
atf_add_test_case inplace_command_q
@ -142,4 +158,5 @@ atf_init_test_cases()
atf_add_test_case escape_subst
atf_add_test_case commands_on_stdin
atf_add_test_case hex_subst
atf_add_test_case bracket_y
}