Adding upstream version 1.8.upstream/1.8

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

2 files changed, 7 insertions, 7 deletions

diff --git a/testsuite/check.sh b/testsuite/check.sh
index f871f28..3ac3604 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -29,7 +29,7 @@ fail=0
 "${LZIP}" -cd "${testdir}"/COPYING.lz > copy || fail=1
 cmp in copy || fail=1
 
-for i in 1 2 3 4 5 6 7 8 9; do
+for i in s4096 1 2 3 4 5 6 7 8 9; do
 	"${LZIP}" -k -$i in || fail=1
 	mv -f in.lz copy.lz || fail=1
 	echo -n "garbage" >> copy.lz || fail=1
@@ -38,7 +38,7 @@ for i in 1 2 3 4 5 6 7 8 9; do
 	echo -n .
 done
 
-for i in 1 2 3 4 5 6 7 8 9; do
+for i in s4096 1 2 3 4 5 6 7 8 9; do
 	"${LZIP}" -c -$i in > out || fail=1
 	echo -n "g" >> out || fail=1
 	"${LZIP}" -cd out > copy || fail=1
@@ -46,14 +46,14 @@ for i in 1 2 3 4 5 6 7 8 9; do
 	echo -n .
 done
 
-for i in 1 2 3 4 5 6 7 8 9; do
+for i in s4096 1 2 3 4 5 6 7 8 9; do
 	"${LZIP}" -c -$i < in > out || fail=1
 	"${LZIP}" -d < out > copy || fail=1
 	cmp in copy || fail=1
 	echo -n .
 done
 
-for i in 1 2 3 4 5 6 7 8 9; do
+for i in s4096 1 2 3 4 5 6 7 8 9; do
 	"${LZIP}" -f -$i -o out < in || fail=1
 	"${LZIP}" -df -o copy < out.lz || fail=1
 	cmp in copy || fail=1
@@ -70,9 +70,9 @@ for i in 1 2 3; do
 done
 
 echo
-if test ${fail} = 0; then
+if [ ${fail} = 0 ]; then
 	echo "tests completed successfully."
-	if cd "${objdir}" ; then rm -r tmp ; fi
+	cd "${objdir}" && rm -r tmp
 else
 	echo "tests failed."
 fi
diff --git a/testsuite/unzcrash.cc b/testsuite/unzcrash.cc
index bf44628..4856a73 100644
--- a/testsuite/unzcrash.cc
+++ b/testsuite/unzcrash.cc
@@ -19,10 +19,10 @@
       g++ -O2 -Wall -W -o unzcrash testsuite/unzcrash.cc
 */
 
+#include <csignal>
 #include <cstdio>
 #include <cstdlib>
 #include <stdint.h>
-#include <signal.h>
 #include <unistd.h>