Merging upstream version 1.11.

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

11 files changed, 88 insertions, 13 deletions

diff --git a/testsuite/check.sh b/testsuite/check.sh
index 56ebc2b..710f0b8 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# check script for Lzip - A data compressor based on the LZMA algorithm
+# check script for Lzip - Data compressor based on the LZMA algorithm
 # Copyright (C) 2008, 2009, 2010 Antonio Diaz Diaz.
 #
 # This script is free software: you have unlimited permission
@@ -17,17 +17,36 @@ if [ ! -x "${LZIP}" ] ; then
 	echo "${LZIP}: cannot execute"
 	exit 1
 fi
+if [ ! -x "${LZIPRECOVER}" ] ; then
+	echo "${LZIPRECOVER}: cannot execute"
+	exit 1
+fi
 
 if [ -d tmp ] ; then rm -rf tmp ; fi
 mkdir tmp
-printf "testing lzip..."
+printf "testing lzip-%s..." "$2"
 cd "${objdir}"/tmp
 
-cat "${testdir}"/test1 > in || framework_failure
+cat "${testdir}"/test.txt > in || framework_failure
 fail=0
 
-"${LZIP}" -cd "${testdir}"/test1.lz > copy || fail=1
+"${LZIP}" -t "${testdir}"/test_v0.lz || fail=1
+printf .
+"${LZIP}" -cd "${testdir}"/test_v0.lz > copy || fail=1
+cmp in copy || fail=1
+printf .
+
+"${LZIP}" -t "${testdir}"/test_v1.lz || fail=1
+printf .
+"${LZIP}" -cd "${testdir}"/test_v1.lz > copy || fail=1
+cmp in copy || fail=1
+printf .
+
+"${LZIP}" -t "${testdir}"/test_sync.lz || fail=1
+printf .
+"${LZIP}" -cd "${testdir}"/test_sync.lz > copy || fail=1
 cmp in copy || fail=1
+printf .
 
 for i in s4Ki 0 1 2 3 4 5 6 7 8 9 ; do
 	"${LZIP}" -k -$i in || fail=1
@@ -60,15 +79,70 @@ for i in s4Ki 0 1 2 3 4 5 6 7 8 9 ; do
 	printf .
 done
 
-"${LZIP}" -ce in in in > out || fail=1
+# Description of test files for lziprecover:
+# test_bad1.lz: byte at offset 67 changed from 0xCC to 0x33
+# test_bad2.lz: [  34-  66) --> copy of bytes [  68- 100)
+# test_bad3.lz: [ 512-1536) --> zeroed;       [2560-3584) --> zeroed
+# test_bad4.lz: [3072-4096) --> random data;  [4608-5632) --> zeroed
+# test_bad5.lz: [1024-2048) --> random data;  [5120-6144) --> random data
+
+printf "\ntesting lziprecover-%s..." "$2"
+
+"${LZIP}" -c in in in > out || fail=1
 printf "garbage" >> out || fail=1
-"${LZIPRECOVER}" out || fail=1
+"${LZIPRECOVER}" -s out -o out.lz || fail=1
 for i in 1 2 3 ; do
-	"${LZIP}" -cd rec0000${i}out > copy || fail=1
+	"${LZIP}" -cd rec0000${i}out.lz > copy || fail=1
 	cmp in copy || fail=1
 	printf .
 done
 
+"${LZIP}" -0kf -$i in || fail=1
+"${LZIPRECOVER}" -R in.lz > /dev/null || fail=1
+printf .
+"${LZIPRECOVER}" -R "${testdir}"/test_v1.lz > /dev/null || fail=1
+printf .
+
+"${LZIPRECOVER}" -R -o copy.lz "${testdir}"/test_bad1.lz > /dev/null || fail=1
+"${LZIP}" -df copy.lz || fail=1
+cmp in copy || fail=1
+printf .
+
+"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad1.lz "${testdir}"/test_bad2.lz > /dev/null || fail=1
+"${LZIP}" -df copy.lz || fail=1
+cmp in copy || fail=1
+printf .
+"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad2.lz "${testdir}"/test_bad1.lz > /dev/null || fail=1
+"${LZIP}" -df copy.lz || fail=1
+cmp in copy || fail=1
+printf .
+
+for i in 1 2 ; do
+	for j in 3 4 5 ; do
+		"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad${i}.lz "${testdir}"/test_bad${j}.lz > /dev/null || fail=1
+		"${LZIP}" -df copy.lz || fail=1
+		cmp in copy || fail=1
+		printf .
+		"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad${j}.lz "${testdir}"/test_bad${i}.lz > /dev/null || fail=1
+		"${LZIP}" -df copy.lz || fail=1
+		cmp in copy || fail=1
+		printf .
+	done
+done
+
+"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad3.lz "${testdir}"/test_bad4.lz "${testdir}"/test_bad5.lz > /dev/null || fail=1
+"${LZIP}" -df copy.lz || fail=1
+cmp in copy || fail=1
+printf .
+"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad4.lz "${testdir}"/test_bad5.lz "${testdir}"/test_bad3.lz > /dev/null || fail=1
+"${LZIP}" -df copy.lz || fail=1
+cmp in copy || fail=1
+printf .
+"${LZIPRECOVER}" -m -o copy.lz "${testdir}"/test_bad5.lz "${testdir}"/test_bad3.lz "${testdir}"/test_bad4.lz > /dev/null || fail=1
+"${LZIP}" -df copy.lz || fail=1
+cmp in copy || fail=1
+printf .
+
 echo
 if [ ${fail} = 0 ] ; then
 	echo "tests completed successfully."
diff --git a/testsuite/test1 b/testsuite/test.txt
index 5b244d5..5b244d5 100644
--- a/testsuite/test1
+++ b/testsuite/test.txt
diff --git a/testsuite/test_bad1.lz b/testsuite/test_bad1.lz
new file mode 100644
index 0000000..0b84883
--- /dev/null
+++ b/testsuite/test_bad1.lz
diff --git a/testsuite/test_bad2.lz b/testsuite/test_bad2.lz
new file mode 100644
index 0000000..cce6a3c
--- /dev/null
+++ b/testsuite/test_bad2.lz
diff --git a/testsuite/test_bad3.lz b/testsuite/test_bad3.lz
new file mode 100644
index 0000000..a1676bb
--- /dev/null
+++ b/testsuite/test_bad3.lz
diff --git a/testsuite/test_bad4.lz b/testsuite/test_bad4.lz
new file mode 100644
index 0000000..a8f89a3
--- /dev/null
+++ b/testsuite/test_bad4.lz
diff --git a/testsuite/test_bad5.lz b/testsuite/test_bad5.lz
new file mode 100644
index 0000000..73e0142
--- /dev/null
+++ b/testsuite/test_bad5.lz
diff --git a/testsuite/test_sync.lz b/testsuite/test_sync.lz
new file mode 100644
index 0000000..419fa97
--- /dev/null
+++ b/testsuite/test_sync.lz
diff --git a/testsuite/test1.lz b/testsuite/test_v0.lz
index a09b1e8..a09b1e8 100644
--- a/testsuite/test1.lz
+++ b/testsuite/test_v0.lz
diff --git a/testsuite/test_v1.lz b/testsuite/test_v1.lz
new file mode 100644
index 0000000..f1c79eb
--- /dev/null
+++ b/testsuite/test_v1.lz
diff --git a/testsuite/unzcrash.cc b/testsuite/unzcrash.cc
index f61f8a8..7d10b28 100644
--- a/testsuite/unzcrash.cc
+++ b/testsuite/unzcrash.cc
@@ -16,7 +16,7 @@
     a bug.
 
     Compile this file with the command:
-      g++ -O2 -Wall -W -o unzcrash testsuite/unzcrash.cc
+      g++ -Wall -W -O2 -o unzcrash testsuite/unzcrash.cc
 */
 
 #include <csignal>
@@ -26,9 +26,9 @@
 #include <unistd.h>
 
 
-int main( const int argc, const char * argv[] )
+int main( const int argc, const char * const argv[] )
   {
-  if( argc < 3 )
+  if( argc != 3 )
     {
     std::fprintf( stderr, "Usage: unzcrash \"lzip -tv\" filename.lz\n" );
     return 1;
@@ -41,8 +41,8 @@ int main( const int argc, const char * argv[] )
     return 1;
     }
 
-  const int buffer_size = 1 << 20;
-  uint8_t buffer[buffer_size];
+  const int buffer_size = 1 << 21;
+  uint8_t * const buffer = new uint8_t[buffer_size];
   const int size = std::fread( buffer, 1, buffer_size, f );
   if( size >= buffer_size )
     {
@@ -64,7 +64,7 @@ int main( const int argc, const char * argv[] )
     return 1;
     }
 
-  signal( SIGPIPE, SIG_IGN );
+  std::signal( SIGPIPE, SIG_IGN );
 
   for( int byte = 0; byte < size; ++byte )
     {
@@ -81,5 +81,6 @@ int main( const int argc, const char * argv[] )
     ++buffer[byte];
     }
 
+  delete[] buffer;
   return 0;
   }