Adding upstream version 1.18.upstream/1.18

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

1 files changed, 154 insertions, 66 deletions

diff --git a/testsuite/check.sh b/testsuite/check.sh
index 537f5f0..285d225 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # check script for Lziprecover - Data recovery tool for the lzip format
-# Copyright (C) 2009-2015 Antonio Diaz Diaz.
+# Copyright (C) 2009-2016 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
 # to copy, distribute and modify it.
@@ -18,20 +18,28 @@ if [ ! -f "${LZIP}" ] || [ ! -x "${LZIP}" ] ; then
 	exit 1
 fi
 
+if [ -e "${LZIP}" ] 2> /dev/null ; then true
+else
+	echo "$0: a POSIX shell is required to run the tests"
+	echo "Try bash -c \"$0 $1 $2\""
+	exit 1
+fi
+
 if [ -d tmp ] ; then rm -rf tmp ; fi
 mkdir tmp
-cd "${objdir}"/tmp
+cd "${objdir}"/tmp || framework_failure
 
 cat "${testdir}"/test.txt > in || framework_failure
 in_lz="${testdir}"/test.txt.lz
+in_lzma="${testdir}"/test.txt.lzma
 inD="${testdir}"/test21723.txt
-fox5_lz="${testdir}"/fox5.lz
-f5b1="${testdir}"/fox5_bad1.txt
-f5b1_lz="${testdir}"/fox5_bad1.lz
-f5b2_lz="${testdir}"/fox5_bad2.lz
-f5b3_lz="${testdir}"/fox5_bad3.lz
-f5b4_lz="${testdir}"/fox5_bad4.lz
-f5b5_lz="${testdir}"/fox5_bad5.lz
+fox6_lz="${testdir}"/fox6.lz
+f6b1="${testdir}"/fox6_bad1.txt
+f6b1_lz="${testdir}"/fox6_bad1.lz
+f6b2_lz="${testdir}"/fox6_bad2.lz
+f6b3_lz="${testdir}"/fox6_bad3.lz
+f6b4_lz="${testdir}"/fox6_bad4.lz
+f6b5_lz="${testdir}"/fox6_bad5.lz
 bad1_lz="${testdir}"/test_bad1.lz
 bad2_lz="${testdir}"/test_bad2.lz
 bad3_lz="${testdir}"/test_bad3.lz
@@ -40,15 +48,16 @@ bad5_lz="${testdir}"/test_bad5.lz
 fail=0
 
 # Description of test files for lziprecover:
-# fox5_bad1.lz: byte at offset  62 changed from 0x50 to 0x70 (CRC)
-#               byte at offset 144 changed from 0x2D to 0x2E (data_size)
-#               byte at offset 188 changed from 0x34 to 0x33 (mid stream)
-#               byte at offset 247 changed from 0x2A to 0x2B (first byte)
-#               byte at offset 378 changed from 0xA0 to 0x20 (EOS marker)
-# fox5_bad2.lz: [ 30- 49] --> zeroed;
-# fox5_bad3.lz: [100-299] --> zeroed;
-# fox5_bad4.lz: [250-349] --> zeroed;
-# fox5_bad5.lz: [300-399] --> zeroed;
+# fox6_bad1.lz: byte at offset   5 changed from 0x0C to 0x00 (DS)
+#               byte at offset 142 changed from 0x50 to 0x70 (CRC)
+#               byte at offset 224 changed from 0x2D to 0x2E (data_size)
+#               byte at offset 268 changed from 0x34 to 0x33 (mid stream)
+#               byte at offset 327 changed from 0x2A to 0x2B (byte 7)
+#               byte at offset 458 changed from 0xA0 to 0x20 (EOS marker)
+# fox6_bad2.lz: [110-129] --> zeroed;
+# fox6_bad3.lz: [180-379] --> zeroed;
+# fox6_bad4.lz: [330-429] --> zeroed;
+# fox6_bad5.lz: [380-479] --> zeroed;
 # test_bad1.lz: byte at offset 66 changed from 0xA6 to 0x46
 # test_bad2.lz: [  34-  65] --> copy of bytes [  68-  99]
 # test_bad3.lz: [ 512-1535] --> zeroed;       [2560-3583] --> zeroed
@@ -78,26 +87,88 @@ if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
 "${LZIPRECOVER}" -sq
 if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
 
-"${LZIP}" -t "${in_lz}" || fail=1
+"${LZIPRECOVER}" -Aq in
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIPRECOVER}" -Aq < in > copy.lz		# /dev/null returns 1 on OS/2
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIPRECOVER}" -Aq < "${in_lz}" > copy.lz
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIPRECOVER}" -Aq "${in_lz}"
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIPRECOVER}" -Akq "${in_lzma}"
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIPRECOVER}" -Ac "${in_lzma}" > copy.lz
+if [ $? = 0 ] && cmp "${in_lz}" copy.lz ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIPRECOVER}" -A < "${in_lzma}" > copy.lz
+if [ $? = 0 ] && cmp "${in_lz}" copy.lz ; then printf . ; else printf - ; fail=1 ; fi
+rm -f copy.lz
+cat "${in_lzma}" > copy.lzma || framework_failure
+"${LZIPRECOVER}" -Ak copy.lzma
+if [ $? = 0 ] && cmp "${in_lz}" copy.lz ; then printf . ; else printf - ; fail=1 ; fi
+printf "to be overwritten" > copy.lz || framework_failure
+"${LZIPRECOVER}" -Af copy.lzma
+if [ $? = 0 ] && cmp "${in_lz}" copy.lz ; then printf . ; else printf - ; fail=1 ; fi
+rm -f copy.lz
+cat "${in_lzma}" > copy.tlz || framework_failure
+"${LZIPRECOVER}" -Ak copy.tlz
+if [ $? = 0 ] && cmp "${in_lz}" copy.tar.lz ; then printf . ; else printf - ; fail=1 ; fi
+printf "to be overwritten" > copy.tar.lz || framework_failure
+"${LZIPRECOVER}" -Af copy.tlz
+if [ $? = 0 ] && cmp "${in_lz}" copy.tar.lz ; then printf . ; else printf - ; fail=1 ; fi
+rm -f copy.tar.lz
+cat "${in_lzma}" > anyothername || framework_failure
+"${LZIPRECOVER}" -A -o copy - anyothername - < "${in_lzma}"
+if [ $? = 0 ] && cmp "${in_lz}" copy.lz && cmp "${in_lz}" anyothername.lz ; then
+	printf . ; else printf - ; fail=1 ; fi
+rm -f copy.lz anyothername.lz
+
+printf "\ntesting decompression..."
+
+"${LZIP}" -t "${in_lz}"
+if [ $? = 0 ] ; then printf . ; else printf - ; fail=1 ; fi
 "${LZIP}" -cd "${in_lz}" > copy || fail=1
 cmp in copy || fail=1
 printf .
 
+rm -f copy
 cat "${in_lz}" > copy.lz || framework_failure
-printf "to be overwritten" > copy || framework_failure
-"${LZIP}" -df copy.lz || fail=1
+"${LZIP}" -dk copy.lz || fail=1
 cmp in copy || fail=1
-printf .
+printf "to be overwritten" > copy || framework_failure
+"${LZIP}" -dq copy.lz
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -df copy.lz
+if [ $? = 0 ] && [ ! -e copy.lz ] && cmp in copy ; then
+	printf . ; else printf - ; fail=1 ; fi
 
 printf "to be overwritten" > copy || framework_failure
 "${LZIP}" -df -o copy < "${in_lz}" || fail=1
 cmp in copy || fail=1
 printf .
 
+rm -f copy
 cat "${in_lz}" > anyothername || framework_failure
-"${LZIP}" -d anyothername || fail=1
-cmp in anyothername.out || fail=1
-printf .
+"${LZIP}" -d -o copy - anyothername - < "${in_lz}"
+if [ $? = 0 ] && cmp in copy && cmp in anyothername.out ; then
+	printf . ; else printf - ; fail=1 ; fi
+rm -f copy anyothername.out
+
+"${LZIP}" -tq in "${in_lz}"
+if [ $? = 2 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -tq foo.lz "${in_lz}"
+if [ $? = 1 ] ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -cdq in "${in_lz}" > copy
+if [ $? = 2 ] && cat copy in | cmp in - ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -cdq foo.lz "${in_lz}" > copy
+if [ $? = 1 ] && cmp in copy ; then printf . ; else printf - ; fail=1 ; fi
+rm -f copy
+cat "${in_lz}" > copy.lz || framework_failure
+"${LZIP}" -dq in copy.lz
+if [ $? = 2 ] && [ -e copy.lz ] && [ ! -e copy ] && [ ! -e in.out ] ; then
+	printf . ; else printf - ; fail=1 ; fi
+"${LZIP}" -dq foo.lz copy.lz
+if [ $? = 1 ] && [ ! -e copy.lz ] && [ ! -e foo ] && cmp in copy ; then
+	printf . ; else printf - ; fail=1 ; fi
 
 cat in in > in2 || framework_failure
 cat "${in_lz}" "${in_lz}" > copy2.lz || framework_failure
@@ -121,67 +192,84 @@ printf "to be overwritten" > copy2 || framework_failure
 cmp in2 copy2 || fail=1
 printf .
 
+"${LZIPRECOVER}" -D ,18000 "${in_lz}" > copy || fail=1
+"${LZIPRECOVER}" -D 18000 "${in_lz}" >> copy || fail=1
+cmp in copy || fail=1
+printf .
 "${LZIPRECOVER}" -D 21723-22120 -fo copy "${in_lz}" || fail=1
 cmp "${inD}" copy || fail=1
 "${LZIPRECOVER}" -D 21723,397 "${in_lz}" > copy || fail=1
 cmp "${inD}" copy || fail=1
 printf .
-"${LZIPRECOVER}" -D0 -iq "${f5b1_lz}" -fo copy
-if [ $? = 2 ] && cmp "${f5b1}" copy ; then printf . ; else printf - ; fail=1 ; fi
-"${LZIPRECOVER}" -D0 -iq "${f5b1_lz}" > copy
-if [ $? = 2 ] && cmp "${f5b1}" copy ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIPRECOVER}" -D0 -iq "${f6b1_lz}" -fo copy
+if [ $? = 2 ] && cmp "${f6b1}" copy ; then printf . ; else printf - ; fail=1 ; fi
+"${LZIPRECOVER}" -D0 -iq "${f6b1_lz}" > copy
+if [ $? = 2 ] && cmp "${f6b1}" copy ; then printf . ; else printf - ; fail=1 ; fi
 
-printf "\ntesting --merge  ..."
+printf "\ntesting --merge..."
 
 rm -f copy.lz
-"${LZIPRECOVER}" -m -o copy.lz "${fox5_lz}" "${f5b1_lz}"
+"${LZIPRECOVER}" -m -o copy.lz "${fox6_lz}" "${f6b1_lz}"
 if [ $? = 0 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
-"${LZIPRECOVER}" -m -o copy.lz "${f5b1_lz}" "${fox5_lz}"
+"${LZIPRECOVER}" -m -o copy.lz "${f6b1_lz}" "${fox6_lz}"
 if [ $? = 0 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
 "${LZIPRECOVER}" -m -o copy.lz "${bad1_lz}" "${bad2_lz}" "${bad1_lz}" -q
 if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
-"${LZIPRECOVER}" -m -o copy.lz "${f5b1_lz}" "${f5b5_lz}" -q
+"${LZIPRECOVER}" -m -o copy.lz "${bad1_lz}" "${bad2_lz}" "${bad2_lz}" -q
+if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
+cat "${bad2_lz}" > bad2.lz || framework_failure
+"${LZIPRECOVER}" -m -o copy.lz "${bad1_lz}" "${bad2_lz}" bad2.lz -q
+if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
+rm -f bad2.lz
+"${LZIPRECOVER}" -m -o copy.lz "${f6b1_lz}" "${f6b5_lz}" -q
 if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
-"${LZIPRECOVER}" -m -o copy.lz "${f5b3_lz}" "${f5b5_lz}" -q
+"${LZIPRECOVER}" -m -o copy.lz "${f6b3_lz}" "${f6b5_lz}" -q
 if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
 "${LZIPRECOVER}" -m -o copy.lz "${bad3_lz}" "${bad4_lz}" -q
 if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
 
-for i in "${f5b1_lz}" "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" ; do
-	"${LZIPRECOVER}" -mf -o copy.lz "${f5b2_lz}" "${i}" || fail=1
-	cmp "${fox5_lz}" copy.lz || fail=1
-	"${LZIPRECOVER}" -mf -o copy.lz "${i}" "${f5b2_lz}" || fail=1
-	cmp "${fox5_lz}" copy.lz || fail=1
+"${LZIPRECOVER}" -mf -o copy.lz "${f6b1_lz}" "${f6b4_lz}" || fail=1
+cmp "${fox6_lz}" copy.lz || fail=1
+printf .
+"${LZIPRECOVER}" -mf -o copy.lz "${f6b4_lz}" "${f6b1_lz}" || fail=1
+cmp "${fox6_lz}" copy.lz || fail=1
+printf .
+
+for i in "${f6b1_lz}" "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" ; do
+	"${LZIPRECOVER}" -mf -o copy.lz "${f6b2_lz}" "${i}" || fail=1
+	cmp "${fox6_lz}" copy.lz || fail=1
+	"${LZIPRECOVER}" -mf -o copy.lz "${i}" "${f6b2_lz}" || fail=1
+	cmp "${fox6_lz}" copy.lz || fail=1
 	printf .
 done
 
-for i in "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" ; do
-	"${LZIPRECOVER}" -mf -o copy.lz "${f5b1_lz}" "${f5b2_lz}" "${i}" || fail=1
-	cmp "${fox5_lz}" copy.lz || fail=1
-	"${LZIPRECOVER}" -mf -o copy.lz "${f5b1_lz}" "${i}" "${f5b2_lz}" || fail=1
-	cmp "${fox5_lz}" copy.lz || fail=1
-	"${LZIPRECOVER}" -mf -o copy.lz "${f5b2_lz}" "${f5b1_lz}" "${i}" || fail=1
-	cmp "${fox5_lz}" copy.lz || fail=1
-	"${LZIPRECOVER}" -mf -o copy.lz "${f5b2_lz}" "${i}" "${f5b1_lz}" || fail=1
-	cmp "${fox5_lz}" copy.lz || fail=1
-	"${LZIPRECOVER}" -mf -o copy.lz "${i}" "${f5b1_lz}" "${f5b2_lz}" || fail=1
-	cmp "${fox5_lz}" copy.lz || fail=1
-	"${LZIPRECOVER}" -mf -o copy.lz "${i}" "${f5b2_lz}" "${f5b1_lz}" || fail=1
-	cmp "${fox5_lz}" copy.lz || fail=1
+for i in "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" ; do
+	"${LZIPRECOVER}" -mf -o copy.lz "${f6b1_lz}" "${f6b2_lz}" "${i}" || fail=1
+	cmp "${fox6_lz}" copy.lz || fail=1
+	"${LZIPRECOVER}" -mf -o copy.lz "${f6b1_lz}" "${i}" "${f6b2_lz}" || fail=1
+	cmp "${fox6_lz}" copy.lz || fail=1
+	"${LZIPRECOVER}" -mf -o copy.lz "${f6b2_lz}" "${f6b1_lz}" "${i}" || fail=1
+	cmp "${fox6_lz}" copy.lz || fail=1
+	"${LZIPRECOVER}" -mf -o copy.lz "${f6b2_lz}" "${i}" "${f6b1_lz}" || fail=1
+	cmp "${fox6_lz}" copy.lz || fail=1
+	"${LZIPRECOVER}" -mf -o copy.lz "${i}" "${f6b1_lz}" "${f6b2_lz}" || fail=1
+	cmp "${fox6_lz}" copy.lz || fail=1
+	"${LZIPRECOVER}" -mf -o copy.lz "${i}" "${f6b2_lz}" "${f6b1_lz}" || fail=1
+	cmp "${fox6_lz}" copy.lz || fail=1
 	printf .
 done
 
-"${LZIPRECOVER}" -mf -o copy.lz "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" || fail=1
-cmp "${fox5_lz}" copy.lz || fail=1
+"${LZIPRECOVER}" -mf -o copy.lz "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" || fail=1
+cmp "${fox6_lz}" copy.lz || fail=1
 printf .
-"${LZIPRECOVER}" -mf -o copy.lz "${f5b1_lz}" "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" || fail=1
-cmp "${fox5_lz}" copy.lz || fail=1
+"${LZIPRECOVER}" -mf -o copy.lz "${f6b1_lz}" "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" || fail=1
+cmp "${fox6_lz}" copy.lz || fail=1
 printf .
-"${LZIPRECOVER}" -mf -o copy.lz "${f5b2_lz}" "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" || fail=1
-cmp "${fox5_lz}" copy.lz || fail=1
+"${LZIPRECOVER}" -mf -o copy.lz "${f6b2_lz}" "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" || fail=1
+cmp "${fox6_lz}" copy.lz || fail=1
 printf .
-"${LZIPRECOVER}" -mf -o copy.lz "${f5b1_lz}" "${f5b2_lz}" "${f5b3_lz}" "${f5b4_lz}" "${f5b5_lz}" || fail=1
-cmp "${fox5_lz}" copy.lz || fail=1
+"${LZIPRECOVER}" -mf -o copy.lz "${f6b1_lz}" "${f6b2_lz}" "${f6b3_lz}" "${f6b4_lz}" "${f6b5_lz}" || fail=1
+cmp "${fox6_lz}" copy.lz || fail=1
 printf .
 
 "${LZIPRECOVER}" -mf -o copy.lz "${bad1_lz}" "${bad2_lz}" || fail=1
@@ -266,10 +354,10 @@ printf .
 cmp out4.lz copy4.lz || fail=1
 printf .
 
-printf "\ntesting --repair ..."
+printf "\ntesting --repair..."
 
 rm -f copy.lz
-"${LZIPRECOVER}" -R -o copy.lz "${fox5_lz}" || fail=1
+"${LZIPRECOVER}" -R -o copy.lz "${fox6_lz}" || fail=1
 if [ $? = 0 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
 "${LZIPRECOVER}" -R -o copy.lz "${bad2_lz}" -q
 if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
@@ -277,14 +365,14 @@ if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
 if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
 "${LZIPRECOVER}" -R -o copy.lz "${bad4_lz}" -q
 if [ $? = 2 ] && [ ! -e copy.lz ] ; then printf . ; else printf - ; fail=1 ; fi
-"${LZIPRECOVER}" -Rf -o copy.lz "${f5b1_lz}" || fail=1
-cmp "${fox5_lz}" copy.lz || fail=1
+"${LZIPRECOVER}" -Rf -o copy.lz "${f6b1_lz}" || fail=1
+cmp "${fox6_lz}" copy.lz || fail=1
 printf .
 "${LZIPRECOVER}" -Rf -o copy.lz "${bad1_lz}" || fail=1
 cmp "${in_lz}" copy.lz || fail=1
 printf .
 
-cat "${f5b1_lz}" > copy.tar.lz || framework_failure
+cat "${f6b1_lz}" > copy.tar.lz || framework_failure
 "${LZIPRECOVER}" -R copy.tar.lz || fail=1
 if [ $? = 0 ] && [ -e copy_fixed.tar.lz ] ; then printf . ; else printf - ; fail=1 ; fi
 mv copy.tar.lz copy.lz || framework_failure
@@ -294,7 +382,7 @@ mv copy.lz copy.tlz || framework_failure
 "${LZIPRECOVER}" -R copy.tlz || fail=1
 if [ $? = 0 ] && [ -e copy_fixed.tlz ] ; then printf . ; else printf - ; fail=1 ; fi
 
-printf "\ntesting --split  ..."
+printf "\ntesting --split..."
 
 cat "${in_lz}" "${in_lz}" "${in_lz}" > copy || framework_failure
 printf "garbage" >> copy || fail=1