Merge remote-tracking branch 'origin/stable/10' into develdevel

1 files changed, 209 insertions, 35 deletions

diff --git a/contrib/netbsd-tests/bin/sh/t_fsplit.sh b/contrib/netbsd-tests/bin/sh/t_fsplit.sh
index 2c3dbae..a37804b 100755
--- a/contrib/netbsd-tests/bin/sh/t_fsplit.sh
+++ b/contrib/netbsd-tests/bin/sh/t_fsplit.sh
@@ -1,6 +1,6 @@
-# $NetBSD: t_fsplit.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+# $NetBSD: t_fsplit.sh,v 1.4 2016/03/27 14:50:01 christos Exp $
 #
-# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# Copyright (c) 2007-2016 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,22 +33,51 @@
 # the "${x-" and "}" were absent from the input line.
 #
 # So: sh -c 'set ${x-a b c}; echo $#' should give 3.
+# and: sh -c 'set -- ${x-}' echo $#' shold give 0
 #
 
+# the implementation of "sh" to test
+: ${TEST_SH:="/bin/sh"}
+
 nl='
 '
 
 check()
 {
-	result="$(eval $1)"
+	TEST=$((${TEST} + 1))
+
+	case "$#" in
+	(2)	;;
+	(*)	atf_fail "Internal test error, $# args to check test ${TEST}";;
+	esac
+
+	result=$( ${TEST_SH} -c "unset x; $1" )
+	STATUS="$?"
+
 	# Remove newlines
 	oifs="$IFS"
 	IFS="$nl"
 	result="$(echo $result)"
 	IFS="$oifs"
+
+	# trim the test text in case we use it in a message below
+	case "$1" in
+	????????????????*)
+		set -- "$(expr "$1" : '\(............\).*')..." "$2" ;;
+	esac
+
 	if [ "$2" != "$result" ]
 	then
-		atf_fail "expected [$2], found [$result]"
+		if [ "${STATUS}" = "0" ]
+		then
+		  atf_fail "Test ${TEST} '$1': expected [$2], found [$result]"
+		else
+		  atf_fail \
+	  "TEST ${TEST} '$1' failed ($STATUS): expected [$2], found [$result]"
+		fi
+	elif [ "${STATUS}" != 0 ]
+	then
+		  atf_fail "TEST ${TEST} '$1' failed ($STATUS)"
 	fi
 }
 
@@ -59,6 +88,7 @@ for_head() {
 for_body() {
 	unset x
 
+	TEST=0
 	# Since I managed to break this, leave the test in
 	check 'for f in $x; do echo x${f}y; done' ''
 }
@@ -68,17 +98,121 @@ default_val_head() {
 	atf_set "descr" "Checks field splitting in variable default values"
 }
 default_val_body() {
-	unset x
-
+	TEST=0
 	# Check that IFS is applied to text from ${x-...} unless it is inside
 	# any set of "..."
-	check 'set ${x-a b c}; echo $#' 3
-	check 'for i in ${x-a b c};            do echo "z${i}z"; done' 'zaz zbz zcz'
-	check 'for i in ${x-"a b" c};          do echo "z${i}z"; done' 'za bz zcz'
-	check 'for i in ${x-"a ${x-b c}" d};   do echo "z${i}z"; done' 'za b cz zdz'
-	check 'for i in ${x-"a ${x-"b c"}" d}; do echo "z${i}z"; done' 'za b cz zdz'
-	check 'for i in ${x-a ${x-"b c"} d};   do echo "z${i}z"; done' 'zaz zb cz zdz'
-	check 'for i in ${x-a ${x-b c} d};     do echo "z${i}z"; done' 'zaz zbz zcz zdz'
+	check 'set -- ${x-a b c};   echo $#'   3
+
+	check 'set -- ${x-"a b" c}; echo $#'   2
+	check 'set -- ${x-a "b c"}; echo $#'   2
+	check 'set -- ${x-"a b c"}; echo $#'   1
+
+	check "set -- \${x-'a b' c}; echo \$#" 2
+	check "set -- \${x-a 'b c'}; echo \$#" 2
+	check "set -- \${x-'a b c'}; echo \$#" 1
+
+	check 'set -- ${x-a\ b c};  echo $#'   2
+	check 'set -- ${x-a b\ c};  echo $#'   2
+	check 'set -- ${x-a\ b\ c}; echo $#'   1
+
+	check 'set -- ${x};        echo $#' 0
+	check 'set -- ${x-};       echo $#' 0
+	check 'set -- ${x-""};     echo $#' 1
+	check 'set -- ""${x};      echo $#' 1
+	check 'set -- ""${x-};     echo $#' 1
+	check 'set -- ""${x-""};   echo $#' 1
+	check 'set -- ${x}"";      echo $#' 1
+	check 'set -- ${x-}"";     echo $#' 1
+	check 'set -- ${x-""}"";   echo $#' 1
+	check 'set -- ""${x}"";    echo $#' 1
+	check 'set -- ""${x-}"";   echo $#' 1
+	check 'set -- ""${x-""}""; echo $#' 1
+
+	check 'for i in ${x-a b c};            do echo "z${i}z"; done' \
+		'zaz zbz zcz'
+	check 'for i in ${x-"a b" c};          do echo "z${i}z"; done' \
+		'za bz zcz'
+	check 'for i in ${x-"a ${x-b c}" d};   do echo "z${i}z"; done' \
+		'za b cz zdz'
+	check 'for i in ${x-a ${x-b c} d};     do echo "z${i}z"; done' \
+		'zaz zbz zcz zdz'
+
+	# I am not sure these two are correct, the rules on quoting word
+	# in ${var-word} are peculiar, and hard to fathom...
+	# They are what the NetBSD shell does, and bash, not the freebsd shell
+	# (as of Mar 1, 2016)
+
+	check 'for i in ${x-"a ${x-"b c"}" d}; do echo "z${i}z"; done' \
+		'za b cz zdz'
+	check 'for i in ${x-a ${x-"b c"} d};   do echo "z${i}z"; done' \
+		'zaz zb cz zdz'
+}
+
+atf_test_case replacement_val
+replacement_val_head() {
+	atf_set "descr" "Checks field splitting in variable replacement values"
+}
+replacement_val_body() {
+	TEST=0
+
+	# Check that IFS is applied to text from ${x+...} unless it is inside
+	# any set of "...", or whole expansion is quoted, or both...
+
+	check 'x=BOGUS; set -- ${x+a b c};   echo $#'   3
+
+	check 'x=BOGUS; set -- ${x+"a b" c}; echo $#'   2
+	check 'x=BOGUS; set -- ${x+a "b c"}; echo $#'   2
+	check 'x=BOGUS; set -- ${x+"a b c"}; echo $#'   1
+
+	check "x=BOGUS; set -- \${x+'a b' c}; echo \$#" 2
+	check "x=BOGUS; set -- \${x+a 'b c'}; echo \$#" 2
+	check "x=BOGUS; set -- \${x+'a b c'}; echo \$#" 1
+
+	check 'x=BOGUS; set -- ${x+a\ b c};  echo $#'   2
+	check 'x=BOGUS; set -- ${x+a b\ c};  echo $#'   2
+	check 'x=BOGUS; set -- ${x+a\ b\ c}; echo $#'   1
+
+	check 'x=BOGUS; set -- ${x+};       echo $#' 0
+	check 'x=BOGUS; set -- ${x+""};     echo $#' 1
+	check 'x=BOGUS; set -- ""${x+};     echo $#' 1
+	check 'x=BOGUS; set -- ""${x+""};   echo $#' 1
+	check 'x=BOGUS; set -- ${x+}"";     echo $#' 1
+	check 'x=BOGUS; set -- ${x+""}"";   echo $#' 1
+	check 'x=BOGUS; set -- ""${x+}"";   echo $#' 1
+	check 'x=BOGUS; set -- ""${x+""}""; echo $#' 1
+
+	# verify that the value of $x does not affecty the value of ${x+...}
+	check 'x=BOGUS; set -- ${x+};       echo X$1' X
+	check 'x=BOGUS; set -- ${x+""};     echo X$1' X
+	check 'x=BOGUS; set -- ""${x+};     echo X$1' X
+	check 'x=BOGUS; set -- ""${x+""};   echo X$1' X
+	check 'x=BOGUS; set -- ${x+}"";     echo X$1' X
+	check 'x=BOGUS; set -- ${x+""}"";   echo X$1' X
+	check 'x=BOGUS; set -- ""${x+}"";   echo X$1' X
+	check 'x=BOGUS; set -- ""${x+""}""; echo X$1' X
+
+	check 'x=BOGUS; set -- ${x+};       echo X${1-:}X' X:X
+	check 'x=BOGUS; set -- ${x+""};     echo X${1-:}X' XX
+	check 'x=BOGUS; set -- ""${x+};     echo X${1-:}X' XX
+	check 'x=BOGUS; set -- ""${x+""};   echo X${1-:}X' XX
+	check 'x=BOGUS; set -- ${x+}"";     echo X${1-:}X' XX
+	check 'x=BOGUS; set -- ${x+""}"";   echo X${1-:}X' XX
+	check 'x=BOGUS; set -- ""${x+}"";   echo X${1-:}X' XX
+	check 'x=BOGUS; set -- ""${x+""}""; echo X${1-:}X' XX
+
+	# and validate that the replacement can be used as expected
+	check 'x=BOGUS; for i in ${x+a b c};            do echo "z${i}z"; done'\
+		'zaz zbz zcz'
+	check 'x=BOGUS; for i in ${x+"a b" c};          do echo "z${i}z"; done'\
+		'za bz zcz'
+	check 'x=BOGUS; for i in ${x+"a ${x+b c}" d};   do echo "z${i}z"; done'\
+		'za b cz zdz'
+	check 'x=BOGUS; for i in ${x+"a ${x+"b c"}" d}; do echo "z${i}z"; done'\
+		'za b cz zdz'
+	check 'x=BOGUS; for i in ${x+a ${x+"b c"} d};   do echo "z${i}z"; done'\
+		'zaz zb cz zdz'
+	check 'x=BOGUS; for i in ${x+a ${x+b c} d};     do echo "z${i}z"; done'\
+		'zaz zbz zcz zdz'
 }
 
 atf_test_case ifs_alpha
@@ -89,13 +223,19 @@ ifs_alpha_head() {
 ifs_alpha_body() {
 	unset x
 
+	TEST=0
 	# repeat with an alphabetic in IFS
 	check 'IFS=q; set ${x-aqbqc}; echo $#' 3
-	check 'IFS=q; for i in ${x-aqbqc};            do echo "z${i}z"; done' 'zaz zbz zcz'
-	check 'IFS=q; for i in ${x-"aqb"qc};          do echo "z${i}z"; done' 'zaqbz zcz'
-	check 'IFS=q; for i in ${x-"aq${x-bqc}"qd};   do echo "z${i}z"; done' 'zaqbqcz zdz'
-	check 'IFS=q; for i in ${x-"aq${x-"bqc"}"qd}; do echo "z${i}z"; done' 'zaqbqcz zdz'
-	check 'IFS=q; for i in ${x-aq${x-"bqc"}qd};  do echo "z${i}z"; done' 'zaz zbqcz zdz'
+	check 'IFS=q; for i in ${x-aqbqc};            do echo "z${i}z"; done' \
+		'zaz zbz zcz'
+	check 'IFS=q; for i in ${x-"aqb"qc};          do echo "z${i}z"; done' \
+		'zaqbz zcz'
+	check 'IFS=q; for i in ${x-"aq${x-bqc}"qd};   do echo "z${i}z"; done' \
+		'zaqbqcz zdz'
+	check 'IFS=q; for i in ${x-"aq${x-"bqc"}"qd}; do echo "z${i}z"; done' \
+		'zaqbqcz zdz'
+	check 'IFS=q; for i in ${x-aq${x-"bqc"}qd};  do echo "z${i}z"; done' \
+		'zaz zbqcz zdz'
 }
 
 atf_test_case quote
@@ -106,6 +246,7 @@ quote_head() {
 quote_body() {
 	unset x
 
+	TEST=0
 	# Some quote propagation checks
 	check 'set "${x-a b c}";   echo $#' 1
 	check 'set "${x-"a b" c}"; echo $1' 'a b c'
@@ -120,19 +261,44 @@ dollar_at_head() {
 dollar_at_body() {
 	unset x
 
+	TEST=0
 	# Check we get "$@" right
-	check 'set "";        for i;           do echo "z${i}z"; done' 'zz'
-	check 'set "";        for i in "$@";   do echo "z${i}z"; done' 'zz'
-	check 'set "" "";     for i;           do echo "z${i}z"; done' 'zz zz'
-	check 'set "" "";     for i in "$@";   do echo "z${i}z"; done' 'zz zz'
-	check 'set "" "";     for i in $@;     do echo "z${i}z"; done' ''
-	check 'set "a b" c;   for i;           do echo "z${i}z"; done' 'za bz zcz'
-	check 'set "a b" c;   for i in "$@";   do echo "z${i}z"; done' 'za bz zcz'
-	check 'set "a b" c;   for i in $@;     do echo "z${i}z"; done' 'zaz zbz zcz'
-	check 'set " a b " c; for i in "$@";   do echo "z${i}z"; done' 'z a b z zcz'
-	check 'set --;        for i in x"$@"x; do echo "z${i}z"; done' 'zxxz'
-	check 'set a;         for i in x"$@"x; do echo "z${i}z"; done' 'zxaxz'
-	check 'set a b;       for i in x"$@"x; do echo "z${i}z"; done' 'zxaz zbxz'
+
+	check 'set --;        for i in x"$@"x;  do echo "z${i}z"; done' 'zxxz'
+	check 'set a;         for i in x"$@"x;  do echo "z${i}z"; done' 'zxaxz'
+	check 'set a b;       for i in x"$@"x;  do echo "z${i}z"; done' 'zxaz zbxz'
+
+	check 'set --;        for i;            do echo "z${i}z"; done' ''
+	check 'set --;        for i in $@;      do echo "z${i}z"; done' ''
+	check 'set --;        for i in "$@";    do echo "z${i}z"; done' ''
+	# atf_expect_fail "PR bin/50834"
+	check 'set --;        for i in ""$@;    do echo "z${i}z"; done' 'zz'
+	# atf_expect_pass
+	check 'set --;        for i in $@"";    do echo "z${i}z"; done' 'zz'
+	check 'set --;        for i in ""$@"";  do echo "z${i}z"; done' 'zz'
+	check 'set --;        for i in """$@";  do echo "z${i}z"; done' 'zz'
+	check 'set --;        for i in "$@""";  do echo "z${i}z"; done' 'zz'
+	check 'set --;        for i in """$@""";do echo "z${i}z"; done' 'zz'
+
+	check 'set "";        for i;            do echo "z${i}z"; done' 'zz'
+	check 'set "";        for i in "$@";    do echo "z${i}z"; done' 'zz'
+	check 'set "" "";     for i;            do echo "z${i}z"; done' 'zz zz'
+	check 'set "" "";     for i in "$@";    do echo "z${i}z"; done' 'zz zz'
+	check 'set "" "";     for i in $@;      do echo "z${i}z"; done' ''
+
+	check 'set "a b" c;   for i;            do echo "z${i}z"; done' \
+		'za bz zcz'
+	check 'set "a b" c;   for i in "$@";    do echo "z${i}z"; done' \
+		'za bz zcz'
+	check 'set "a b" c;   for i in $@;      do echo "z${i}z"; done' \
+		'zaz zbz zcz'
+	check 'set " a b " c; for i in "$@";    do echo "z${i}z"; done' \
+		'z a b z zcz'
+
+	check 'set a b c;     for i in "$@$@";  do echo "z${i}z"; done' \
+		'zaz zbz zcaz zbz zcz'
+	check 'set a b c;     for i in "$@""$@";do echo "z${i}z"; done' \
+		'zaz zbz zcaz zbz zcz'
 }
 
 atf_test_case ifs
@@ -143,6 +309,7 @@ ifs_head() {
 ifs_body() {
 	unset x
 
+	TEST=0
 	# Some IFS tests
 	check 't="-- ";    IFS=" ";  set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '0'
 	check 't=" x";     IFS=" x"; set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '1'
@@ -165,19 +332,26 @@ var_length_head() {
 	                "a variable's length"
 }
 var_length_body() {
-	unset x
+	TEST=0
 
-	# Check that we apply IFS to ${#var}
 	long=12345678123456781234567812345678
 	long=$long$long$long$long
-	check 'echo ${#long}; IFS=2; echo ${#long}; set 1 ${#long};echo $#' '128 1 8 3'
-	check 'IFS=2; set ${x-${#long}};   IFS=" "; echo $* $#' '1 8 2'
-	check 'IFS=2; set ${x-"${#long}"}; IFS=" "; echo $* $#' '128 1'
+	export long
+
+	# first test that the test method works...
+	check 'set -u; : ${long}; echo ${#long}' '128'
+
+	# Check that we apply IFS to ${#var}
+	check 'echo ${#long}; IFS=2; echo ${#long}; set 1 ${#long};echo $#' \
+		'128 1 8 3'
+	check 'IFS=2; set ${x-${#long}};   IFS=" "; echo $* $#'   '1 8 2'
+	check 'IFS=2; set ${x-"${#long}"}; IFS=" "; echo $* $#'   '128 1'
 }
 
 atf_init_test_cases() {
 	atf_add_test_case for
 	atf_add_test_case default_val
+	atf_add_test_case replacement_val
 	atf_add_test_case ifs_alpha
 	atf_add_test_case quote
 	atf_add_test_case dollar_at