From c4cf542c575068d55368e771abf6c358bfebf5d3 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 2 Oct 2016 17:55:51 +0200
Subject: [PATCH] sh testsuite: create hush-redir/* and move files around

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 .../ash-redir}/redir1.right                   |  0
 .../ash-redir}/redir1.tests                   |  0
 .../ash-redir}/redir_script.right             |  0
 .../ash-redir}/redir_script.tests             |  0
 .../ash-redir}/redir_space.right              |  0
 .../ash-redir}/redir_space.tests              |  0
 shell/hush_test/hush-redir/redir1.right       | 12 ++++++
 shell/hush_test/hush-redir/redir1.tests       | 40 +++++++++++++++++++
 .../{hush-misc => hush-redir}/redir2.right    |  0
 .../{hush-misc => hush-redir}/redir2.tests    |  0
 .../{hush-misc => hush-redir}/redir3.right    |  0
 .../{hush-misc => hush-redir}/redir3.tests    |  0
 .../{hush-misc => hush-redir}/redir4.right    |  0
 .../{hush-misc => hush-redir}/redir4.tests    |  0
 .../{hush-misc => hush-redir}/redir5.right    |  0
 .../{hush-misc => hush-redir}/redir5.tests    |  0
 .../{hush-misc => hush-redir}/redir6.right    |  0
 .../{hush-misc => hush-redir}/redir6.tests    |  0
 shell/hush_test/hush-redir/redir7.right       |  3 ++
 shell/hush_test/hush-redir/redir7.tests       | 12 ++++++
 shell/hush_test/hush-redir/redir8.right       |  3 ++
 shell/hush_test/hush-redir/redir8.tests       | 15 +++++++
 shell/hush_test/hush-redir/redir9.right       |  2 +
 shell/hush_test/hush-redir/redir9.tests       |  4 ++
 shell/hush_test/hush-redir/redirA.right       |  2 +
 shell/hush_test/hush-redir/redirA.tests       | 11 +++++
 shell/hush_test/hush-redir/redir_script.right |  1 +
 shell/hush_test/hush-redir/redir_script.tests | 29 ++++++++++++++
 shell/hush_test/hush-redir/redir_space.right  |  3 ++
 shell/hush_test/hush-redir/redir_space.tests  |  6 +++
 30 files changed, 143 insertions(+)
 rename shell/{hush_test/hush-misc => ash_test/ash-redir}/redir1.right (100%)
 rename shell/{hush_test/hush-misc => ash_test/ash-redir}/redir1.tests (100%)
 rename shell/{hush_test/hush-misc => ash_test/ash-redir}/redir_script.right (100%)
 rename shell/{hush_test/hush-misc => ash_test/ash-redir}/redir_script.tests (100%)
 rename shell/{hush_test/hush-parsing => ash_test/ash-redir}/redir_space.right (100%)
 rename shell/{hush_test/hush-parsing => ash_test/ash-redir}/redir_space.tests (100%)
 create mode 100644 shell/hush_test/hush-redir/redir1.right
 create mode 100755 shell/hush_test/hush-redir/redir1.tests
 rename shell/hush_test/{hush-misc => hush-redir}/redir2.right (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir2.tests (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir3.right (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir3.tests (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir4.right (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir4.tests (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir5.right (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir5.tests (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir6.right (100%)
 rename shell/hush_test/{hush-misc => hush-redir}/redir6.tests (100%)
 create mode 100644 shell/hush_test/hush-redir/redir7.right
 create mode 100755 shell/hush_test/hush-redir/redir7.tests
 create mode 100644 shell/hush_test/hush-redir/redir8.right
 create mode 100755 shell/hush_test/hush-redir/redir8.tests
 create mode 100644 shell/hush_test/hush-redir/redir9.right
 create mode 100755 shell/hush_test/hush-redir/redir9.tests
 create mode 100644 shell/hush_test/hush-redir/redirA.right
 create mode 100755 shell/hush_test/hush-redir/redirA.tests
 create mode 100644 shell/hush_test/hush-redir/redir_script.right
 create mode 100755 shell/hush_test/hush-redir/redir_script.tests
 create mode 100644 shell/hush_test/hush-redir/redir_space.right
 create mode 100755 shell/hush_test/hush-redir/redir_space.tests

diff --git a/shell/hush_test/hush-misc/redir1.right b/shell/ash_test/ash-redir/redir1.right
similarity index 100%
rename from shell/hush_test/hush-misc/redir1.right
rename to shell/ash_test/ash-redir/redir1.right
diff --git a/shell/hush_test/hush-misc/redir1.tests b/shell/ash_test/ash-redir/redir1.tests
similarity index 100%
rename from shell/hush_test/hush-misc/redir1.tests
rename to shell/ash_test/ash-redir/redir1.tests
diff --git a/shell/hush_test/hush-misc/redir_script.right b/shell/ash_test/ash-redir/redir_script.right
similarity index 100%
rename from shell/hush_test/hush-misc/redir_script.right
rename to shell/ash_test/ash-redir/redir_script.right
diff --git a/shell/hush_test/hush-misc/redir_script.tests b/shell/ash_test/ash-redir/redir_script.tests
similarity index 100%
rename from shell/hush_test/hush-misc/redir_script.tests
rename to shell/ash_test/ash-redir/redir_script.tests
diff --git a/shell/hush_test/hush-parsing/redir_space.right b/shell/ash_test/ash-redir/redir_space.right
similarity index 100%
rename from shell/hush_test/hush-parsing/redir_space.right
rename to shell/ash_test/ash-redir/redir_space.right
diff --git a/shell/hush_test/hush-parsing/redir_space.tests b/shell/ash_test/ash-redir/redir_space.tests
similarity index 100%
rename from shell/hush_test/hush-parsing/redir_space.tests
rename to shell/ash_test/ash-redir/redir_space.tests
diff --git a/shell/hush_test/hush-redir/redir1.right b/shell/hush_test/hush-redir/redir1.right
new file mode 100644
index 000000000..15515d1af
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir1.right
@@ -0,0 +1,12 @@
+Test 0:  var:ok
+File created:ok
+Test 1:  var:ok
+File created:ok
+Test 2:  var:ok
+File created:ok
+Test 3:  var:ok
+File created:ok
+Test 4:  var:ok
+File created:ok
+Test 5:  var:ok
+File created:ok
diff --git a/shell/hush_test/hush-redir/redir1.tests b/shell/hush_test/hush-redir/redir1.tests
new file mode 100755
index 000000000..ef2fbfb77
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir1.tests
@@ -0,0 +1,40 @@
+rm shell_test_$$ 2>/dev/null
+var=bad
+>shell_test_$$ var=ok
+echo "Test 0:  var:$var"
+test -f shell_test_$$ && echo "File created:ok"
+
+rm shell_test_$$ 2>/dev/null
+var=bad
+var=ok >shell_test_$$
+echo "Test 1:  var:$var"
+test -f shell_test_$$ && echo "File created:ok"
+
+rm shell_test_$$ 2>/dev/null
+var=ok
+true | var=bad >shell_test_$$
+echo "Test 2:  var:$var"
+test -f shell_test_$$ && echo "File created:ok"
+
+rm shell_test_$$ 2>/dev/null
+var=bad
+{ var=ok >shell_test_$$; }
+echo "Test 3:  var:$var"
+test -f shell_test_$$ && echo "File created:ok"
+
+rm shell_test_$$ 2>/dev/null
+var=ok
+{ var=bad >shell_test_$$; } &
+# cant use usleep as it isnt standard in $PATH --
+# we fail when testing busybox compiled solely as "hush"
+wait
+echo "Test 4:  var:$var"
+test -f shell_test_$$ && echo "File created:ok"
+
+rm shell_test_$$ 2>/dev/null
+var=ok
+( var=bad >shell_test_$$ )
+echo "Test 5:  var:$var"
+test -f shell_test_$$ && echo "File created:ok"
+
+rm shell_test_$$ 2>/dev/null
diff --git a/shell/hush_test/hush-misc/redir2.right b/shell/hush_test/hush-redir/redir2.right
similarity index 100%
rename from shell/hush_test/hush-misc/redir2.right
rename to shell/hush_test/hush-redir/redir2.right
diff --git a/shell/hush_test/hush-misc/redir2.tests b/shell/hush_test/hush-redir/redir2.tests
similarity index 100%
rename from shell/hush_test/hush-misc/redir2.tests
rename to shell/hush_test/hush-redir/redir2.tests
diff --git a/shell/hush_test/hush-misc/redir3.right b/shell/hush_test/hush-redir/redir3.right
similarity index 100%
rename from shell/hush_test/hush-misc/redir3.right
rename to shell/hush_test/hush-redir/redir3.right
diff --git a/shell/hush_test/hush-misc/redir3.tests b/shell/hush_test/hush-redir/redir3.tests
similarity index 100%
rename from shell/hush_test/hush-misc/redir3.tests
rename to shell/hush_test/hush-redir/redir3.tests
diff --git a/shell/hush_test/hush-misc/redir4.right b/shell/hush_test/hush-redir/redir4.right
similarity index 100%
rename from shell/hush_test/hush-misc/redir4.right
rename to shell/hush_test/hush-redir/redir4.right
diff --git a/shell/hush_test/hush-misc/redir4.tests b/shell/hush_test/hush-redir/redir4.tests
similarity index 100%
rename from shell/hush_test/hush-misc/redir4.tests
rename to shell/hush_test/hush-redir/redir4.tests
diff --git a/shell/hush_test/hush-misc/redir5.right b/shell/hush_test/hush-redir/redir5.right
similarity index 100%
rename from shell/hush_test/hush-misc/redir5.right
rename to shell/hush_test/hush-redir/redir5.right
diff --git a/shell/hush_test/hush-misc/redir5.tests b/shell/hush_test/hush-redir/redir5.tests
similarity index 100%
rename from shell/hush_test/hush-misc/redir5.tests
rename to shell/hush_test/hush-redir/redir5.tests
diff --git a/shell/hush_test/hush-misc/redir6.right b/shell/hush_test/hush-redir/redir6.right
similarity index 100%
rename from shell/hush_test/hush-misc/redir6.right
rename to shell/hush_test/hush-redir/redir6.right
diff --git a/shell/hush_test/hush-misc/redir6.tests b/shell/hush_test/hush-redir/redir6.tests
similarity index 100%
rename from shell/hush_test/hush-misc/redir6.tests
rename to shell/hush_test/hush-redir/redir6.tests
diff --git a/shell/hush_test/hush-redir/redir7.right b/shell/hush_test/hush-redir/redir7.right
new file mode 100644
index 000000000..6430b0211
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir7.right
@@ -0,0 +1,3 @@
+Ok
+Ok
+Done
diff --git a/shell/hush_test/hush-redir/redir7.tests b/shell/hush_test/hush-redir/redir7.tests
new file mode 100755
index 000000000..e873a4622
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir7.tests
@@ -0,0 +1,12 @@
+# Chars above 0x7f are used as special codes.
+# 0x81 is CTLESC (see ash.c).
+# The bug was that quoting and unquoting of them
+# was out of sync for redirect filenames.
+
+>unicode.sh
+printf 'echo Ok >uni\x81code\n' >>unicode.sh
+printf 'cat uni\x81code\n' >>unicode.sh
+printf 'cat uni?code\n' >>unicode.sh
+. ./unicode.sh
+rm uni*code*
+echo Done
diff --git a/shell/hush_test/hush-redir/redir8.right b/shell/hush_test/hush-redir/redir8.right
new file mode 100644
index 000000000..6430b0211
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir8.right
@@ -0,0 +1,3 @@
+Ok
+Ok
+Done
diff --git a/shell/hush_test/hush-redir/redir8.tests b/shell/hush_test/hush-redir/redir8.tests
new file mode 100755
index 000000000..2bd386749
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir8.tests
@@ -0,0 +1,15 @@
+# Chars above 0x7f are used as special codes.
+# 0x81 is CTLESC (see ash.c).
+# The bug was that quoting and unquoting of them
+# was out of sync for redirect filenames.
+
+# Subcase when redirect filename is specified in a variable.
+
+>unicode.sh
+printf 'v=uni\x81code\n' >>unicode.sh
+printf 'echo Ok >"$v"\n' >>unicode.sh
+printf 'cat uni\x81code\n' >>unicode.sh
+printf 'cat uni?code\n' >>unicode.sh
+. ./unicode.sh
+rm uni*code*
+echo Done
diff --git a/shell/hush_test/hush-redir/redir9.right b/shell/hush_test/hush-redir/redir9.right
new file mode 100644
index 000000000..34c2512e4
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir9.right
@@ -0,0 +1,2 @@
+Ok
+Done:0
diff --git a/shell/hush_test/hush-redir/redir9.tests b/shell/hush_test/hush-redir/redir9.tests
new file mode 100755
index 000000000..8befa611c
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir9.tests
@@ -0,0 +1,4 @@
+echo Ok >file.tmp
+cat 0<>file.tmp
+echo Done:$?
+rm file.tmp
diff --git a/shell/hush_test/hush-redir/redirA.right b/shell/hush_test/hush-redir/redirA.right
new file mode 100644
index 000000000..31406e336
--- /dev/null
+++ b/shell/hush_test/hush-redir/redirA.right
@@ -0,0 +1,2 @@
+tmp11
+tmp11
diff --git a/shell/hush_test/hush-redir/redirA.tests b/shell/hush_test/hush-redir/redirA.tests
new file mode 100755
index 000000000..56833f938
--- /dev/null
+++ b/shell/hush_test/hush-redir/redirA.tests
@@ -0,0 +1,11 @@
+x="tmp11:tmp22"
+
+# Bug was incorrectly expanding variables in >redir
+echo "${x%:*}" >"${x%:*}"
+echo tmp1*
+rm tmp1*
+
+# Also try unquoted
+echo "${x%:*}" >${x%:*}
+echo tmp1*
+rm tmp1*
diff --git a/shell/hush_test/hush-redir/redir_script.right b/shell/hush_test/hush-redir/redir_script.right
new file mode 100644
index 000000000..6694ed334
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_script.right
@@ -0,0 +1 @@
+Ok: script fd is not closed
diff --git a/shell/hush_test/hush-redir/redir_script.tests b/shell/hush_test/hush-redir/redir_script.tests
new file mode 100755
index 000000000..ccc497d7b
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_script.tests
@@ -0,0 +1,29 @@
+# Builds a " 3>&- 4>&-" string.
+# Note: one of these fds is a directory opened to /proc/self/fd
+# for globbing. It is unwanted, but I don't know how to filter it out.
+find_fds() {
+	fds=""
+	for f in /proc/self/fd/*; do
+		test "$f" = "/proc/self/fd/0" && continue
+		test "$f" = "/proc/self/fd/1" && continue
+		test "$f" = "/proc/self/fd/2" && continue
+		fds="$fds ${f##*/}>&-"
+	done
+}
+
+find_fds
+fds1="$fds"
+
+# One of the fds is open to the script body
+# Close it while executing something.
+eval "find_fds $fds"
+
+# Shell should not lose that fd. Did it?
+find_fds
+test x"$fds1" = x"$fds" && { echo "Ok: script fd is not closed"; exit 0; }
+
+echo "Bug: script fd is closed"
+echo "fds1:$fds1"
+echo "fds2:$fds"
+exit 1
+
diff --git a/shell/hush_test/hush-redir/redir_space.right b/shell/hush_test/hush-redir/redir_space.right
new file mode 100644
index 000000000..084295204
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_space.right
@@ -0,0 +1,3 @@
+z1.tmp: 1
+z2.tmp: 1
+"z1.tmp z2.tmp": TEST 0
diff --git a/shell/hush_test/hush-redir/redir_space.tests b/shell/hush_test/hush-redir/redir_space.tests
new file mode 100755
index 000000000..c0b543098
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_space.tests
@@ -0,0 +1,6 @@
+v='z1.tmp z2.tmp'
+echo TEST >$v
+echo 'z1.tmp:' `cat 'z1.tmp' 2>/dev/null; echo $?`
+echo 'z2.tmp:' `cat 'z2.tmp' 2>/dev/null; echo $?`
+echo '"z1.tmp z2.tmp":' `cat 'z1.tmp z2.tmp' 2>/dev/null; echo $?`
+rm z*.tmp
-- 
2.25.1