Merge branch 'busybox' into merge

4 files changed, 10 insertions, 3 deletions

diff --git a/shell/hush_test/hush-misc/export1.right b/shell/hush_test/hush-misc/export1.right
new file mode 100644
index 000000000..56647af8e
--- /dev/null
+++ b/shell/hush_test/hush-misc/export1.right
@@ -0,0 +1 @@
+|\w \\ \ \|
diff --git a/shell/hush_test/hush-misc/export1.tests b/shell/hush_test/hush-misc/export1.tests
new file mode 100755
index 000000000..4ffb40bdc
--- /dev/null
+++ b/shell/hush_test/hush-misc/export1.tests
@@ -0,0 +1,2 @@
+export Z='\w \\ \ \'
+echo "|$Z|"
diff --git a/shell/hush_test/hush-vars/param_expand_default.right b/shell/hush_test/hush-vars/param_expand_default.right
index acc717205..8bd0814b0 100644
--- a/shell/hush_test/hush-vars/param_expand_default.right
+++ b/shell/hush_test/hush-vars/param_expand_default.right
@@ -1,8 +1,9 @@
 hush: syntax error: unterminated ${name}
-hush: syntax error: unterminated ${name}
 _0 _0
 _ _ _ _word _word
 _aaaa _aaaa _aaaa _aaaa _aaaa
 _ _ _ _word _word
 _ _ _ _ _word
 _fff _fff _fff _fff _fff
+1:1
+0:0
diff --git a/shell/hush_test/hush-vars/param_expand_default.tests b/shell/hush_test/hush-vars/param_expand_default.tests
index 16e5f8efe..dbd3e2218 100755
--- a/shell/hush_test/hush-vars/param_expand_default.tests
+++ b/shell/hush_test/hush-vars/param_expand_default.tests
@@ -1,7 +1,5 @@
 # first try some invalid patterns (do in subshell due to parsing error)
 # (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
-# valid in bash and ash (same as $-), not supported in hush (yet?):
-"$THIS_SH" -c 'echo ${-}' SHELL
 "$THIS_SH" -c 'echo ${:-}' SHELL
 
 # now some funky ones
@@ -22,3 +20,8 @@ echo _$f _${f-} _${f:-} _${f-word} _${f:-word}
 
 f=fff
 echo _$f _${f-} _${f:-} _${f-word} _${f:-word}
+
+set --
+set -- "${1-}"; echo 1:$#
+set --
+set -- ${1-}; echo 0:$#