 @@ -1,14 +1,14 @@
-# $NetBSD: t_syntax.sh,v 1.6 2017/07/26 17:50:20 kre Exp $
+# $NetBSD: t_syntax.sh,v 1.7 2017/08/18 21:22:30 kre Exp $
+#
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -251,27 +251,27 @@ c_line_wrapping_body() {
 		cat <<- 'DONE' | atf_check -s exit:0 -o inline:"${R}" ${TEST_SH}
 			case $(( $($a && echo 1 || echo 0) + \
 				 $($b && echo 1 || echo 0) + \
 				 $($c && echo 1 || echo 0) + \
 				 $($d && echo 1 || echo 0) ))
 			in
 			(1)	printf OK ;;
 			(*)	printf BAD ;;
 			esac
 		DONE
 	done
 	# inspired by pkgsrc/pkgtools/cwrappers :: libnbcompat/configure
-	# failure with (broken) sh LINENO core .. avoid recurrence
+	# failure with (broken) sh LINENO code .. avoid recurrence
 	# This test would have failed.
 	cat <<- 'DONE' | atf_check -s exit:0 -o inline:'/tmp\n' ${TEST_SH}
 		dn=/tmp/foo
 		D=`dirname -- "${dn}" ||
 		expr	X"${dn}" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 			X"${dn}" : 'X\(//\)[^/]' \| \
 			X"${dn}" : 'X\(//\)$' \| \
 			X"${dn}" : 'X\(/\)' \| . 2>/dev/null ||
 		echo X"${dn}" |
 		    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 			    s//\1/
+			    q
 @@ -285,31 +285,103 @@ c_line_wrapping_body() {
+			    q
+			  }
 			  /^X\(\/\).*/{
 			    s//\1/
+			    q
+			  }
 			  s/.*/./; q'`
 		echo "${D}"
 	DONE
 	return 0
+}
-atf_test_case d_redirects
+atf_test_case d_cstrings
-d_redirects_head() {
+d_cstrings_head() {
 	atf_set "descr" "Check processing of $' ' quoting (C style strings)"
+}
 d_cstrings_body() {
 	set -xv
 	unset ENV
 	if ! ${TEST_SH} -c ": \$'abc'" ||
 	     test $( ${TEST_SH} -c "printf %s \$'abc'" ) != abc
 	then
 		atf_skip "\$'...' (C style quoted strings) not supported"
 	fi
 	# simple stuff
 	atf_check -s exit:0 -e empty -o inline:'abc\tdef\n' ${TEST_SH} -c \
 		"printf '%s\\n' \$'abc\tdef'"
 	atf_check -s exit:0 -e empty -o inline:'abc\tdef\n' ${TEST_SH} -c \
 		"printf '%s\\n' \$'abc\011def'"
 	atf_check -s exit:0 -e empty -o inline:'abc\tdef\n' ${TEST_SH} -c \
 		"printf '%s\\n' \$'abc\x09'def"
 	atf_check -s exit:0 -e empty -o inline:'abc$def\n' ${TEST_SH} -c \
 		"def=xyz; printf '%s\\n' \$'abc\$def'"
 	# control chars (\c) and unicode \u
 	atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c \
 		"test \$'\\1-\\2-\\3' = \$'\\ca-\\cb-\\cc'"
 	atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c \
 		"test \$'\\r-\\n-\\f' = \$'\\cm-\\cj-\\cl'"
 	atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c \
 		"test \$'\\u0123' = \$'\\304\\243'"
 	atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c \
 		"test \$'\\u0123' = \$'\\xC4\\xA3'"
 	atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c \
 		"test \$'\\c\\\\' = \$'\\x1C'"
 	atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c \
 		"test \$'\\c[\\c]\\c^\\c_\\c?' = \$'\\x1B\\x1D\\x1E\\x1F\\x7F'"
 	# all the \X sequences for a single char X (ie: not hex/octal/unicode)
 	atf_check -s exit:0 -e empty -o inline:'\n\r\t\n' \
 		${TEST_SH} -c "printf '%s\\n' \$'\\a\\b\\e\\f\\n\\r\\t\\v'"
 #	atf_check -s exit:0 -e empty -o inline:'\7\10\33\14\12\15\11\13' \
 	atf_check -s exit:0 -e empty -o inline:'\n\r\t\n' \
 	   ${TEST_SH} -c "printf '%s\\n' \$'\\cG\\cH\\x1b\\cl\\cJ\\cm\\cI\\ck'"
 	atf_check -s exit:0 -e empty -o inline:"'"'"\\\n' \
 		${TEST_SH} -c "printf '%s\\n' \$'\\'\\\"\\\\'"
 	# various invalid $'...' sequences
 	atf_check -s not-exit:0 -e not-empty -o ignore ${TEST_SH} -c \
 		": \$'\\q'"
 	atf_check -s not-exit:0 -e not-empty -o ignore ${TEST_SH} -c \
 		": \$'\\c\\q'"
 	atf_check -s not-exit:0 -e not-empty -o ignore ${TEST_SH} -c \
 		": \$'\\uDEFF'"
 	atf_check -s not-exit:0 -e not-empty -o ignore ${TEST_SH} -c \
 		": \$'\\u00'"
 	atf_check -s not-exit:0 -e not-empty -o ignore ${TEST_SH} -c \
 		": \$'\\u8'"
 	atf_check -s not-exit:0 -e not-empty -o ignore ${TEST_SH} -c \
 		": \$'abcd"
 	atf_check -s not-exit:0 -e not-empty -o ignore ${TEST_SH} -c \
 		": \$'abcd\\"
 	# anything that generates \0 ends the $'...' immediately (\u cannot)
 	atf_check -s exit:0 -e empty -o inline:'aAa' ${TEST_SH} -c \
 		"printf '%s' \$'a\\0x'\$'A\\x00X'\$'a\\c@x'"
 	# \newline in a $'...' is dropped (just like in "" strings)
 	atf_check -s exit:0 -e empty -o inline:'abcdef' ${TEST_SH} -c \
 		"printf '%s' \$'abc\\
 def'"
+}
 atf_test_case f_redirects
 f_redirects_head() {
 	atf_set "descr" "Check parsing of redirect operators"
+}
-d_redirects_body() {
+f_redirects_body() {
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'>/dev/null'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'</dev/null'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'>>/dev/null'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'<>/dev/null'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'</dev/null>/dev/null'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'>|/dev/null'
 @@ -345,31 +417,31 @@ d_redirects_body() {
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'2>& 1'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'FD=1; 2>&"${FD}"'
 	atf_check -s exit:0 -o 'inline:hello\n' -e empty ${TEST_SH} -c \
 		'FD=1; echo hello 2>&"${FD}" >&2'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'2>&- 3<&- 4>&-'
 	return 0
+}
-atf_test_case f_variable_syntax
+atf_test_case g_variable_syntax
-f_variable_syntax_head() {
+g_variable_syntax_head() {
 	atf_set "descr" "Check that var names of all legal forms work"
+}
-f_variable_syntax_body() {
+g_variable_syntax_body() {
 	# don't test _ as a variable, it can be "unusual"
 	for vname in a ab _a _9 a123 a_1_2_3 __ ___ ____ __1__ _0 \
 	    A AA AAA AaBb _A_a A_a_ a1_ abc_123 ab_12_cd_ef_34_99 \
 	    abcdefghijklmnopqrstuvwzyz ABCDEFGHIJKLMNOPQRSTUVWXYZ_ \
 	    A_VERY_LONG_VARIABLE_NAME_that_is_probably_longer_than_most_used_in_the_average_shell_script_already_about_100_chars_in_this_one_but_there_is_not_supposed_to_be_any_limit_on_the_length_at_all \
 	    Then_Make_it_Even_Longer_by_Multiplying_it___A_VERY_LONG_VARIABLE_NAME_that_is_probably_longer_than_most_used_in_the_average_shell_script_already_about_100_chars_in_this_one_but_there_is_not_supposed_to_be_any_limit_on_the_length_at_all__A_VERY_LONG_VARIABLE_NAME_that_is_probably_longer_than_most_used_in_the_average_shell_script_already_about_100_chars_in_this_one_but_there_is_not_supposed_to_be_any_limit_on_the_length_at_all__A_VERY_LONG_VARIABLE_NAME_that_is_probably_longer_than_most_used_in_the_average_shell_script_already_about_100_chars_in_this_one_but_there_is_not_supposed_to_be_any_limit_on_the_length_at_all__A_VERY_LONG_VARIABLE_NAME_that_is_probably_longer_than_most_used_in_the_average_shell_script_already_about_100_chars_in_this_one_but_there_is_not_supposed_to_be_any_limit_on_the_length_at_all \
 	    xyzzy __0123454321__ _0_1_2_3_4_5_6_7_8_9_ ABBA X_ Y__ Z___ \
 	    _____________________________________________________________
 	do
 		atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 			"unset ${vname}"
 		atf_check -s exit:0 -o match:OK -e empty ${TEST_SH} -c \
 			"unset ${vname}; printf %s \${${vname}-OK}"
 @@ -443,31 +515,31 @@ f_variable_syntax_body() {
 			"echo \${${vname}}"
 	done
 	for vname in ,x -p +h :def 0_1 'x*x' '()' '"' "'" 'a b c' x,y,z '?!' \
 	    ';' a-b a+b 'a?b' 'a:b' 'a%b' 'a#b' 0 1 99 @ '*' '!' '?'
 	do
 		# failure modes will differ, but they should all fail somehow
 		atf_check -s not-exit:0 -o ignore -e not-empty ${TEST_SH} -c \
 			"${vname}="
 	done
+}
-atf_test_case g_var_assign
+atf_test_case h_var_assign
-g_var_assign_head() {
+h_var_assign_head() {
 	atf_set "descr" "Check var assignments "
+}
-g_var_assign_body() {
+h_var_assign_body() {
 	atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c \
 		'a=b'
 	atf_check -s not-exit:0 -e not-empty -o empty ${TEST_SH} -c \
 		'\a=b'
 	atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c \
 		'a=b c=d'
 	atf_check -s exit:0 -e empty -o 'inline:e=f\n' ${TEST_SH} -c \
 		'a=b c=d echo e=f'
 	atf_check -s exit:0 -e empty -o 'inline:e=f\n' ${TEST_SH} -c \
 		'a=b 2>/dev/null c=d </dev/null echo e=f'
 	# We need to make sure that we do not accidentally
 	# find a command called 'a=b' ...
 @@ -1107,29 +1179,30 @@ z_PR_52426_body() {
 		'case while in while   );;(if|then|elif|fi);;(do|done);; esac'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'case until in($);;($$);;($4.50);;(1/2);;0.3333);;esac'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'case return in !);; !$);; $!);; !#);; (@);; esac'
 	atf_check -s exit:0 -o empty -e empty ${TEST_SH} -c \
 		'case break in (/);; (\/);; (/\|/\));; (\\//);; esac'
+}
 atf_init_test_cases() {
 	atf_add_test_case a_basic_tokenisation
 	atf_add_test_case b_comments
 	atf_add_test_case c_line_wrapping
-	atf_add_test_case d_redirects
+	atf_add_test_case d_cstrings
-	atf_add_test_case f_variable_syntax
+	atf_add_test_case f_redirects
-	atf_add_test_case g_var_assign
+	atf_add_test_case g_variable_syntax
 	atf_add_test_case h_var_assign
 	atf_add_test_case i_pipelines
 	atf_add_test_case j_and_or_lists
 	atf_add_test_case k_lists
 	atf_add_test_case l_async_lists
 	atf_add_test_case m_compound_lists
 	atf_add_test_case q_for_loop
 	atf_add_test_case r_case
 	atf_add_test_case s_if
 	atf_add_test_case t_loops
 	atf_add_test_case u_case_cont
 	atf_add_test_case x_functions
 	atf_add_test_case z_PR_48498