Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

Conflicts:
	libbb/vfork_daemon_rexec.c
	networking/wget.c
	procps/ps.c

7 files changed, 28 insertions, 0 deletions

diff --git a/testsuite/echo/echo-prints-dash b/testsuite/echo/echo-prints-dash
new file mode 100644
index 000000000..ddcdbadf7
--- /dev/null
+++ b/testsuite/echo/echo-prints-dash
@@ -0,0 +1 @@
+test "`busybox echo - | od -t x1 | head -n 1`" = "0000000 2d 0a"
diff --git a/testsuite/echo/echo-prints-non-opts b/testsuite/echo/echo-prints-non-opts
new file mode 100644
index 000000000..c7d1e201a
--- /dev/null
+++ b/testsuite/echo/echo-prints-non-opts
@@ -0,0 +1 @@
+test "`busybox echo -neEZ | od -t x1 | head -n 1`" = "0000000 2d 6e 65 45 5a 0a"
diff --git a/testsuite/echo/echo-prints-slash_00041 b/testsuite/echo/echo-prints-slash_00041
new file mode 100644
index 000000000..9cffabde0
--- /dev/null
+++ b/testsuite/echo/echo-prints-slash_00041
@@ -0,0 +1,3 @@
+# FEATURE: CONFIG_FEATURE_FANCY_ECHO
+
+test "`busybox echo -ne '\00041z' | od -t x1 | head -n 1`" = "0000000 04 31 7a"
diff --git a/testsuite/echo/echo-prints-slash_0041 b/testsuite/echo/echo-prints-slash_0041
new file mode 100644
index 000000000..b07429dfd
--- /dev/null
+++ b/testsuite/echo/echo-prints-slash_0041
@@ -0,0 +1,3 @@
+# FEATURE: CONFIG_FEATURE_FANCY_ECHO
+
+test "`busybox echo -ne '\0041z' | od -t x1 | head -n 1`" = "0000000 21 7a"
diff --git a/testsuite/echo/echo-prints-slash_041 b/testsuite/echo/echo-prints-slash_041
new file mode 100644
index 000000000..1d70cec92
--- /dev/null
+++ b/testsuite/echo/echo-prints-slash_041
@@ -0,0 +1,3 @@
+# FEATURE: CONFIG_FEATURE_FANCY_ECHO
+
+test "`busybox echo -ne '\041z' | od -t x1 | head -n 1`" = "0000000 21 7a"
diff --git a/testsuite/echo/echo-prints-slash_41 b/testsuite/echo/echo-prints-slash_41
new file mode 100644
index 000000000..6d8999b4e
--- /dev/null
+++ b/testsuite/echo/echo-prints-slash_41
@@ -0,0 +1,3 @@
+# FEATURE: CONFIG_FEATURE_FANCY_ECHO
+
+test "`busybox echo -ne '\41z' | od -t x1 | head -n 1`" = "0000000 21 7a"
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index f2f4e9348..472064f7f 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -154,6 +154,20 @@ dr-xr-x--- input_dir
 SKIP=
 }
 
+# Had a bug where on extract autodetect first "switched off" -z
+# and then failed to recognize .tgz extension
+testing "tar extract tgz" "\
+dd count=1 bs=1M if=/dev/zero of=F0 2>/dev/null
+tar -czf F0.tgz F0
+rm F0
+tar -xzvf F0.tgz && echo Ok
+rm F0 || echo BAD
+" "\
+F0
+Ok
+" \
+"" ""
+
 
 cd .. && rm -rf tar.tempdir || exit 1