Merging upstream version 1.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 62 insertions, 3 deletions

diff --git a/testsuite/check.sh b/testsuite/check.sh
index 4421fc4..a4113c3 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # check script for Plzip - Parallel compressor compatible with lzip
-# Copyright (C) 2009-2017 Antonio Diaz Diaz.
+# Copyright (C) 2009-2018 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
 # to copy, distribute and modify it.
@@ -53,6 +53,8 @@ done
 [ $? = 2 ] || test_failed $LINENO
 "${LZIP}" -cdq < in
 [ $? = 2 ] || test_failed $LINENO
+"${LZIP}" -dq -o in < "${in_lz}"
+[ $? = 1 ] || test_failed $LINENO
 # these are for code coverage
 "${LZIP}" -lt "${in_lz}" 2> /dev/null
 [ $? = 1 ] || test_failed $LINENO
@@ -145,7 +147,7 @@ cat "${in_lz}" "${in_lz}" > in2.lz || framework_failure
 "${LZIP}" -cd in2.lz > copy2 || test_failed $LINENO
 cmp in2 copy2 || test_failed $LINENO
 
-"${LZIP}" --output=copy2 < in2 || test_failed $LINENO
+"${LZIP}" --output=copy2.lz < in2 || test_failed $LINENO
 "${LZIP}" -lq copy2.lz || test_failed $LINENO
 "${LZIP}" -t copy2.lz || test_failed $LINENO
 "${LZIP}" -cd copy2.lz > copy2 || test_failed $LINENO
@@ -226,6 +228,61 @@ cat in in in in in in in in | "${LZIP}" -1s4Ki | "${LZIP}" -t ||
 
 printf "\ntesting bad input..."
 
+headers='LZIp LZiP LZip LzIP LzIp LziP lZIP lZIp lZiP lzIP'
+body='\001\014\000\203\377\373\377\377\300\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000$\000\000\000\000\000\000\000'
+cat "${in_lz}" > in0.lz
+printf "LZIP${body}" >> in0.lz
+if "${LZIP}" -tq in0.lz ; then
+	for header in ${headers} ; do
+		printf "${header}${body}" > in0.lz	# first member
+		"${LZIP}" -lq in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -tq in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -tq < in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -cdq in0.lz > /dev/null
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -lq --loose-trailing in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -tq --loose-trailing in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -tq --loose-trailing < in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -cdq --loose-trailing in0.lz > /dev/null
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		cat "${in_lz}" > in0.lz
+		printf "${header}${body}" >> in0.lz	# trailing data
+		"${LZIP}" -lq in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -tq in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+#		"${LZIP}" -tq < in0.lz			# requires lzlib-1.10
+#		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -cdq in0.lz > /dev/null
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -lq --loose-trailing in0.lz
+		[ $? = 0 ] || test_failed $LINENO ${header}
+		"${LZIP}" -t --loose-trailing in0.lz
+		[ $? = 0 ] || test_failed $LINENO ${header}
+		"${LZIP}" -t --loose-trailing < in0.lz
+		[ $? = 0 ] || test_failed $LINENO ${header}
+		"${LZIP}" -cd --loose-trailing in0.lz > /dev/null
+		[ $? = 0 ] || test_failed $LINENO ${header}
+		"${LZIP}" -lq --loose-trailing --trailing-error in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -tq --loose-trailing --trailing-error in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -tq --loose-trailing --trailing-error < in0.lz
+		[ $? = 2 ] || test_failed $LINENO ${header}
+		"${LZIP}" -cdq --loose-trailing --trailing-error in0.lz > /dev/null
+		[ $? = 2 ] || test_failed $LINENO ${header}
+	done
+else
+	printf "\nwarning: skipping header test: 'printf' does not work on your system."
+fi
+rm -f in0.lz
+
 cat "${in_lz}" "${in_lz}" "${in_lz}" > in3.lz || framework_failure
 if dd if=in3.lz of=trunc.lz bs=14752 count=1 2> /dev/null &&
    [ -e trunc.lz ] && cmp in2.lz trunc.lz > /dev/null 2>&1 ; then
@@ -233,7 +290,7 @@ if dd if=in3.lz of=trunc.lz bs=14752 count=1 2> /dev/null &&
 		dd if=in3.lz of=trunc.lz bs=$i count=1 2> /dev/null
 		"${LZIP}" -lq trunc.lz
 		[ $? = 2 ] || test_failed $LINENO $i
-		"${LZIP}" -t trunc.lz 2> /dev/null
+		"${LZIP}" -tq trunc.lz
 		[ $? = 2 ] || test_failed $LINENO $i
 		"${LZIP}" -tq < trunc.lz
 		[ $? = 2 ] || test_failed $LINENO $i
@@ -245,6 +302,7 @@ if dd if=in3.lz of=trunc.lz bs=14752 count=1 2> /dev/null &&
 else
 	printf "\nwarning: skipping truncation test: 'dd' does not work on your system."
 fi
+rm -f in3.lz trunc.lz
 
 cat "${in_lz}" > ingin.lz || framework_failure
 printf "g" >> ingin.lz || framework_failure
@@ -258,6 +316,7 @@ cat "${in_lz}" >> ingin.lz || framework_failure
 "${LZIP}" -t < ingin.lz || test_failed $LINENO
 "${LZIP}" -d < ingin.lz > copy || test_failed $LINENO
 cmp in copy || test_failed $LINENO
+rm -f ingin.lz
 
 echo
 if [ ${fail} = 0 ] ; then