Index: head/tools/regression/bin/sh/builtins/trap3.0 =================================================================== --- head/tools/regression/bin/sh/builtins/trap3.0 (revision 218888) +++ head/tools/regression/bin/sh/builtins/trap3.0 (revision 218889) @@ -1,12 +1,11 @@ # $FreeBSD$ { trap '' garbage && exit 3 trap - garbage && exit 3 trap true garbage && exit 3 trap '' 99999 && exit 3 trap - 99999 && exit 3 trap true 99999 && exit 3 } 2>/dev/null -test -n "$(trap true garbage TERM 2>/dev/null || trap)" || exit 3 exit 0 Index: head/tools/regression/bin/sh/builtins/trap8.0 =================================================================== --- head/tools/regression/bin/sh/builtins/trap8.0 (nonexistent) +++ head/tools/regression/bin/sh/builtins/trap8.0 (revision 218889) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +# I am not sure if POSIX requires the shell to continue processing +# further trap names in the same trap command after an invalid one. + +test -n "$(trap true garbage TERM 2>/dev/null || trap)" || exit 3 +exit 0 Property changes on: head/tools/regression/bin/sh/builtins/trap8.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/tools/regression/bin/sh/parser/for1.0 =================================================================== --- head/tools/regression/bin/sh/parser/for1.0 (revision 218888) +++ head/tools/regression/bin/sh/parser/for1.0 (revision 218889) @@ -1,29 +1,29 @@ # $FreeBSD$ nl=' ' list=' a b c' for s1 in "$nl" " "; do for s2 in "$nl" ";" ";$nl"; do for s3 in "$nl" " "; do r='' eval "for i${s1}in ${list}${s2}do${s3}r=\"\$r \$i\"; done" [ "$r" = "$list" ] || exit 1 done done done set -- $list -for s2 in "$nl" " " ";" ";$nl"; do # s2=";" and ";$nl" are extensions to POSIX +for s2 in "$nl" " "; do for s3 in "$nl" " "; do r='' eval "for i${s2}do${s3}r=\"\$r \$i\"; done" [ "$r" = "$list" ] || exit 1 done done for s1 in "$nl" " "; do for s2 in "$nl" ";" ";$nl"; do for s3 in "$nl" " "; do eval "for i${s1}in${s2}do${s3}exit 1; done" done done done Index: head/tools/regression/bin/sh/parser/for2.0 =================================================================== --- head/tools/regression/bin/sh/parser/for2.0 (nonexistent) +++ head/tools/regression/bin/sh/parser/for2.0 (revision 218889) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +# Common extensions to the 'for' syntax. + +nl=' +' +list=' a b c' +set -- $list +for s2 in ";" ";$nl"; do + for s3 in "$nl" " "; do + r='' + eval "for i${s2}do${s3}r=\"\$r \$i\"; done" + [ "$r" = "$list" ] || exit 1 + done +done Property changes on: head/tools/regression/bin/sh/parser/for2.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property