From 48fe8b80e2592f26cae686b0b99547b76018aeb1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 28 Dec 2018 10:51:38 +0100
Subject: Adding upstream version 0.8.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 testsuite/check.sh | 489 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 325 insertions(+), 164 deletions(-)

(limited to 'testsuite/check.sh')

diff --git a/testsuite/check.sh b/testsuite/check.sh
index 07b0d34..6bdf2d7 100755
--- a/testsuite/check.sh
+++ b/testsuite/check.sh
@@ -32,9 +32,16 @@ in="${testdir}"/test.txt
 in_lz="${testdir}"/test.txt.lz
 in_tar="${testdir}"/test.txt.tar
 in_tar_lz="${testdir}"/test.txt.tar.lz
+inbad1="${testdir}"/test_bad1.txt
+inbad2="${testdir}"/test_bad2.txt
 test3="${testdir}"/test3.tar
 test3_lz="${testdir}"/test3.tar.lz
-test3a_lz="${testdir}"/test3a.tar.lz
+test3dir_lz="${testdir}"/test3_dir.tar.lz
+test3dot_lz="${testdir}"/test3_dot.tar.lz
+t155="${testdir}"/t155.tar
+t155_lz="${testdir}"/t155.tar.lz
+tlzit1="${testdir}"/tlz_in_tar1.tar
+tlzit2="${testdir}"/tlz_in_tar2.tar
 bad1="${testdir}"/test3_bad1.tar
 bad2="${testdir}"/test3_bad2.tar
 bad3="${testdir}"/test3_bad3.tar
@@ -48,10 +55,19 @@ bad5_lz="${testdir}"/test3_bad5.tar.lz
 bad6_lz="${testdir}"/test3_bad6.tar.lz
 eof_lz="${testdir}"/eof.tar.lz
 fail=0
+lwarn=0
 test_failed() { fail=1 ; printf " $1" ; [ -z "$2" ] || printf "($2)" ; }
+lzlib_1_11() { [ ${lwarn} = 0 ] &&
+	printf "\nwarning: testing --keep-damaged requires lzlib-1.11-rc2 or newer\n$1"
+	lwarn=1 ; }
 
-# Description of test files for lziprecover:
+# Description of test files for tarlz:
+# t155.tar[.lz]      directory + file + link + eof, all with 155 char names
+# test_bad1.tar.lz:  truncated at offset 6000 (of 7495)
+# test_bad2.tar.lz:  byte at offset 6000 changed from 0x56 to 0x46
 # test3.tar:         3 members (foo bar baz) + 2 zeroed 512-byte blocks
+# test3_dir.tar.lz:  like test3.tar.lz but members /dir/foo /dir/bar /dir/baz
+# test3_dot.tar.lz:  like test3.tar.lz but members ./foo ./bar ./baz
 # test3_bad1.tar:    byte at offset  259 changed from 't' to '0' (magic)
 # test3_bad2.tar:    byte at offset 1283 changed from 't' to '0' (magic)
 # test3_bad3.tar:    byte at offset 2559 changed from 0x00 to 0x20 (padding)
@@ -60,137 +76,191 @@ test_failed() { fail=1 ; printf " $1" ; [ -z "$2" ] || printf "($2)" ; }
 # test3_bad5.tar:    510 zeros + "LZ" prepended to test3.tar (bogus lz header)
 # test3_bad1.tar.lz: byte at offset    2 changed from 'I' to 'i' (magic)
 # test3_bad2.tar.lz: byte at offset   49 changed from 0x49 to 0x69 (mid stream)
-# test3_bad3.tar.lz: byte at offset  149 changed from 0x2D to 0x3D (mid stream)
+# test3_bad3.tar.lz: byte at offset  176 changed from 0x7D to 0x6D (mid stream)
 # test3_bad4.tar.lz: combined damage of test3_bad2.tar.lz and test3_bad3.tar.lz
 # test3_bad5.tar.lz: [71-134] --> zeroed (first trailer + seconf header)
 # test3_bad6.tar.lz: 510 zeros prepended to test3.tar.lz (header in two blocks)
+# tlz_in_tar1.tar:   1 member (test3.tar.lz) first magic damaged
+# tlz_in_tar2.tar:   2 members (foo test3.tar.lz) first magic damaged
+# ug32chars.tar.lz:  1 member (foo) with 32-character owner and group names
 
 printf "testing tarlz-%s..." "$2"
 
-"${TARLZ}" -qtf ${in}
+"${TARLZ}" -q -tf "${in}"
 [ $? = 2 ] || test_failed $LINENO
-"${TARLZ}" -qtf ${in_lz}
+"${TARLZ}" -q -tf "${in_lz}"
 [ $? = 2 ] || test_failed $LINENO
-"${TARLZ}" -qtf nx_file
+"${TARLZ}" -q -tf nx_file
 [ $? = 1 ] || test_failed $LINENO
 "${TARLZ}" -tf 2> /dev/null
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" -qcf out.tar.lz
+"${TARLZ}" -q -cf out.tar.lz
 [ $? = 1 ] || test_failed $LINENO
 [ ! -e out.tar.lz ] || test_failed $LINENO
 "${TARLZ}" -rf out.tar.lz || test_failed $LINENO
 [ ! -e out.tar.lz ] || test_failed $LINENO
-"${TARLZ}" -qrf - ${in}
+"${TARLZ}" -q -rf - "${in}"
 [ $? = 1 ] || test_failed $LINENO
 [ ! -e - ] || test_failed $LINENO
-"${TARLZ}" -qr ${in}
+"${TARLZ}" -q -r "${in}"
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" --uncompressed -qrf out.tar ${in}
+"${TARLZ}" --uncompressed -q -rf out.tar "${in}"
 [ $? = 1 ] || test_failed $LINENO
 [ ! -e out.tar ] || test_failed $LINENO
-cat ${test3_lz} > test.tar.lz || framework_failure
-"${TARLZ}" --uncompressed -qrf test.tar.lz ${in}
+cat "${test3_lz}" > test.tar.lz || framework_failure
+"${TARLZ}" --uncompressed -q -rf test.tar.lz "${in}"
 [ $? = 1 ] || test_failed $LINENO
-cmp ${test3_lz} test.tar.lz || test_failed $LINENO
+cmp "${test3_lz}" test.tar.lz || test_failed $LINENO
 rm -f test.tar.lz || framework_failure
-cat ${test3} > test.tar || framework_failure
-"${TARLZ}" -qrf test.tar ${in}
+cat "${test3}" > test.tar || framework_failure
+"${TARLZ}" -q -rf test.tar "${in}"
 [ $? = 2 ] || test_failed $LINENO
-cmp ${test3} test.tar || test_failed $LINENO
+cmp "${test3}" test.tar || test_failed $LINENO
 rm -f test.tar || framework_failure
-"${TARLZ}" -qc ${in} nx_file > /dev/null
+"${TARLZ}" -q -c "${in}" nx_file > /dev/null
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" -qc -C nx_dir ${in}
+"${TARLZ}" -q -c -C nx_dir "${in}"
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" -qx -C nx_dir ${test3_lz}
+"${TARLZ}" -q -x -C nx_dir "${test3_lz}"
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" -qcr
+"${TARLZ}" -q -cr
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" -qct
+"${TARLZ}" -q -ct
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" -qcx
+"${TARLZ}" -q -cx
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" -qtx
+"${TARLZ}" -q -tx
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" -qctx
+"${TARLZ}" -q -ctx
 [ $? = 1 ] || test_failed $LINENO
 "${TARLZ}" --help > /dev/null || test_failed $LINENO
 "${TARLZ}" -V > /dev/null || test_failed $LINENO
-"${TARLZ}" --bad_option -tf ${test3_lz} 2> /dev/null
+"${TARLZ}" --bad_option -tf "${test3_lz}" 2> /dev/null
 [ $? = 1 ] || test_failed $LINENO
 "${TARLZ}" -tf 2> /dev/null
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" --owner=invalid_oner_name -tf ${test3_lz} 2> /dev/null
+"${TARLZ}" --owner=invalid_oner_name -tf "${test3_lz}" 2> /dev/null
 [ $? = 1 ] || test_failed $LINENO
-"${TARLZ}" --group=invalid_goup_name -tf ${test3_lz} 2> /dev/null
+"${TARLZ}" --group=invalid_goup_name -tf "${test3_lz}" 2> /dev/null
 [ $? = 1 ] || test_failed $LINENO
 
-"${TARLZ}" -tf ${eof_lz} || test_failed $LINENO
-"${TARLZ}" -xf ${eof_lz} || test_failed $LINENO
-"${TARLZ}" -tf ${in_tar_lz} > /dev/null || test_failed $LINENO
-"${TARLZ}" -xf ${in_tar_lz} || test_failed $LINENO
-cmp ${in} test.txt || test_failed $LINENO
+# test --list and --extract
+"${TARLZ}" -tf "${eof_lz}" --missing-crc || test_failed $LINENO
+"${TARLZ}" -xf "${eof_lz}" --missing-crc || test_failed $LINENO
+"${TARLZ}" -tf "${in_tar_lz}" --missing-crc > /dev/null || test_failed $LINENO
+"${TARLZ}" -xf "${in_tar_lz}" --missing-crc || test_failed $LINENO
+cmp "${in}" test.txt || test_failed $LINENO
 rm -f test.txt || framework_failure
-"${TARLZ}" -C nx_dir -tf ${in_tar} > /dev/null || test_failed $LINENO
-"${TARLZ}" -xf ${in_tar} || test_failed $LINENO
-cmp ${in} test.txt || test_failed $LINENO
+"${TARLZ}" -C nx_dir -tf "${in_tar}" > /dev/null || test_failed $LINENO
+"${TARLZ}" -xf "${in_tar}" --missing-crc || test_failed $LINENO
+cmp "${in}" test.txt || test_failed $LINENO
 rm -f test.txt || framework_failure
 
+printf "foo\n" > cfoo || framework_failure
+printf "bar\n" > cbar || framework_failure
+printf "baz\n" > cbaz || framework_failure
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -xf ${test3_lz} || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
-[ -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+"${TARLZ}" -xf "${test3_lz}" --missing-crc || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -xf ${test3} || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
-[ -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+"${TARLZ}" -q -xf "${test3_lz}" ./foo ./bar ./baz || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${test3a_lz} || test_failed $LINENO
-[ -e dir/foo ] || test_failed $LINENO
-[ -e dir/bar ] || test_failed $LINENO
-[ -e dir/baz ] || test_failed $LINENO
+"${TARLZ}" -xf "${test3}" --missing-crc || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
+rm -f foo bar baz || framework_failure
+"${TARLZ}" -q -xf "${test3dot_lz}" --missing-crc || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
+rm -f foo bar baz || framework_failure
+"${TARLZ}" -q -xf "${test3dot_lz}" foo bar baz || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
+rm -f foo bar baz || framework_failure
+"${TARLZ}" -q -xf "${test3dir_lz}" --missing-crc || test_failed $LINENO
+cmp cfoo dir/foo || test_failed $LINENO
+cmp cbar dir/bar || test_failed $LINENO
+cmp cbaz dir/baz || test_failed $LINENO
+rm -rf dir || framework_failure
+"${TARLZ}" -q -xf "${test3dir_lz}" dir/foo dir/bar dir/baz || test_failed $LINENO
+cmp cfoo dir/foo || test_failed $LINENO
+cmp cbar dir/bar || test_failed $LINENO
+cmp cbaz dir/baz || test_failed $LINENO
 rm -rf dir || framework_failure
 
-cat ${in} > test.txt || framework_failure
+# test --concatenate
+cat "${in_tar_lz}" > out.tar.lz || framework_failure
+"${TARLZ}" -Af out.tar.lz "${test3_lz}" || test_failed $LINENO
+"${TARLZ}" -xf out.tar.lz || test_failed $LINENO
+cmp "${in}" test.txt || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
+touch aout.tar.lz || framework_failure		# concatenate to empty file
+"${TARLZ}" -Af aout.tar.lz "${in_tar_lz}" "${test3_lz}" || test_failed $LINENO
+cmp out.tar.lz aout.tar.lz || test_failed $LINENO
+cat "${in_tar_lz}" > aout.tar.lz || framework_failure
+"${TARLZ}" -Aqf aout.tar.lz "${test3_lz}" "${test3}"
+[ $? = 2 ] || test_failed $LINENO
+cmp out.tar.lz aout.tar.lz || test_failed $LINENO
+rm -f test.txt foo bar baz out.tar.lz aout.tar.lz || framework_failure
+
+# test --create
+cat "${in}" > test.txt || framework_failure
 "${TARLZ}" -0 -cf out.tar.lz test.txt || test_failed $LINENO
 rm -f test.txt || framework_failure
-"${TARLZ}" -xf out.tar.lz || test_failed $LINENO
-cmp ${in} test.txt || test_failed $LINENO
-cat ${in} > test.txt || framework_failure
+"${TARLZ}" -xf out.tar.lz --missing-crc || test_failed $LINENO
+cmp "${in}" test.txt || test_failed $LINENO
+cat "${in}" > test.txt || framework_failure
 "${TARLZ}" --uncompressed -cf out.tar test.txt || test_failed $LINENO
 rm -f test.txt || framework_failure
-"${TARLZ}" -xf out.tar || test_failed $LINENO
-cmp ${in} test.txt || test_failed $LINENO
+"${TARLZ}" -xf out.tar --missing-crc || test_failed $LINENO
+cmp "${in}" test.txt || test_failed $LINENO
 rm -f test.txt out.tar out.tar.lz || framework_failure
 
-printf "foo" > foo || framework_failure
+cat cfoo > foo || framework_failure
 rm -f bar || framework_failure
-printf "baz" > baz || framework_failure
-"${TARLZ}" -qcf out.tar.lz foo bar baz
+cat cbaz > baz || framework_failure
+"${TARLZ}" -q -cf out.tar.lz foo bar baz
 [ $? = 1 ] || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -xf out.tar.lz || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
+"${TARLZ}" -xf out.tar.lz --missing-crc || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
 [ ! -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf out.tar.lz bar
+"${TARLZ}" -q -xf out.tar.lz bar
 [ $? = 1 ] || test_failed $LINENO
 [ ! -e foo ] || test_failed $LINENO
 [ ! -e bar ] || test_failed $LINENO
 [ ! -e baz ] || test_failed $LINENO
 rm -f out.tar.lz || framework_failure
 
-printf "foo" > foo || framework_failure
-printf "bar" > bar || framework_failure
-printf "baz" > baz || framework_failure
+cat cfoo > foo || framework_failure
+cat cbar > bar || framework_failure
+cat cbaz > baz || framework_failure
 "${TARLZ}" -0 -cf out.tar.lz foo bar baz || test_failed $LINENO
+"${TARLZ}" -0 -q -cf aout.tar.lz foo bar aout.tar.lz baz || test_failed $LINENO
+cmp out.tar.lz aout.tar.lz || test_failed $LINENO
+"${TARLZ}" -q -Af aout.tar.lz aout.tar.lz || test_failed $LINENO
+cmp out.tar.lz aout.tar.lz || test_failed $LINENO
+"${TARLZ}" -q -rf aout.tar.lz aout.tar.lz || test_failed $LINENO
+cmp out.tar.lz aout.tar.lz || test_failed $LINENO
+rm -f aout.tar.lz || framework_failure
+
+# test --append
 "${TARLZ}" --dsolid -0 -cf aout.tar.lz foo bar baz || test_failed $LINENO
 cmp out.tar.lz aout.tar.lz || test_failed $LINENO
 rm -f aout.tar.lz || framework_failure
-"${TARLZ}" -0 -qcf aout.tar.lz foo/ ./bar ./baz/ || test_failed $LINENO
+"${TARLZ}" -0 -q -cf aout.tar.lz foo/ ./bar ./baz/ || test_failed $LINENO
 cmp out.tar.lz aout.tar.lz || test_failed $LINENO
 rm -f aout.tar.lz || framework_failure
 "${TARLZ}" -0 -cf aout.tar.lz foo || test_failed $LINENO
@@ -204,51 +274,49 @@ cmp out.tar.lz aout.tar.lz || test_failed $LINENO
 cmp out.tar.lz aout.tar.lz || test_failed $LINENO
 "${TARLZ}" -0 -rf aout.tar.lz -C nx_dir || test_failed $LINENO
 cmp out.tar.lz aout.tar.lz || test_failed $LINENO
-"${TARLZ}" -0 -qrf aout.tar.lz nx_file
+"${TARLZ}" -0 -q -rf aout.tar.lz nx_file
 [ $? = 1 ] || test_failed $LINENO
 cmp out.tar.lz aout.tar.lz || test_failed $LINENO
-cat ${eof_lz} > aout.tar.lz || framework_failure	# append to empty archive
+cat "${eof_lz}" > aout.tar.lz || framework_failure	# append to empty archive
 "${TARLZ}" -0 -rf aout.tar.lz foo bar baz || test_failed $LINENO
 cmp out.tar.lz aout.tar.lz || test_failed $LINENO
-mv -f foo foo.orig || framework_failure
-mv -f bar bar.orig || framework_failure
-mv -f baz baz.orig || framework_failure
+rm -f foo bar baz || framework_failure
 "${TARLZ}" -xf out.tar.lz foo/ bar// baz/// || test_failed $LINENO
-cmp foo foo.orig || test_failed $LINENO
-cmp bar bar.orig || test_failed $LINENO
-cmp baz baz.orig || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
 "${TARLZ}" -xf out.tar.lz || test_failed $LINENO
-cmp foo foo.orig || test_failed $LINENO
-cmp bar bar.orig || test_failed $LINENO
-cmp baz baz.orig || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 mkdir dir1 || framework_failure
 "${TARLZ}" -C dir1 -xf out.tar.lz || test_failed $LINENO
-cmp dir1/foo foo.orig || test_failed $LINENO
-cmp dir1/bar bar.orig || test_failed $LINENO
-cmp dir1/baz baz.orig || test_failed $LINENO
+cmp cfoo dir1/foo || test_failed $LINENO
+cmp cbar dir1/bar || test_failed $LINENO
+cmp cbaz dir1/baz || test_failed $LINENO
 rm -f aout.tar.lz foo bar baz || framework_failure
 "${TARLZ}" -C dir1 -0 -cf aout.tar.lz foo bar baz || test_failed $LINENO
 "${TARLZ}" -xf aout.tar.lz || test_failed $LINENO
-cmp foo foo.orig || test_failed $LINENO
-cmp bar bar.orig || test_failed $LINENO
-cmp baz baz.orig || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f aout.tar.lz foo bar baz || framework_failure
 "${TARLZ}" -C dir1 -0 -c foo bar baz | "${TARLZ}" -x || test_failed $LINENO
-cmp foo foo.orig || test_failed $LINENO
-cmp bar bar.orig || test_failed $LINENO
-cmp baz baz.orig || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f dir1/foo dir1/bar dir1/baz || framework_failure
 "${TARLZ}" -0 -c foo bar baz | "${TARLZ}" -C dir1 -x || test_failed $LINENO
-cmp dir1/foo foo.orig || test_failed $LINENO
-cmp dir1/bar bar.orig || test_failed $LINENO
-cmp dir1/baz baz.orig || test_failed $LINENO
+cmp cfoo dir1/foo || test_failed $LINENO
+cmp cbar dir1/bar || test_failed $LINENO
+cmp cbaz dir1/baz || test_failed $LINENO
 rm -f dir1/foo dir1/bar dir1/baz || framework_failure
 "${TARLZ}" -0 -c foo bar baz | "${TARLZ}" -x foo bar baz -C dir1 ||
 	test_failed $LINENO
-cmp dir1/foo foo.orig || test_failed $LINENO
-cmp dir1/bar bar.orig || test_failed $LINENO
-cmp dir1/baz baz.orig || test_failed $LINENO
+cmp cfoo dir1/foo || test_failed $LINENO
+cmp cbar dir1/bar || test_failed $LINENO
+cmp cbaz dir1/baz || test_failed $LINENO
 rm -f foo dir1/bar baz || framework_failure
 "${TARLZ}" -0 -cf aout.tar.lz -C dir1 foo -C .. bar -C dir1 baz ||
 	test_failed $LINENO
@@ -256,22 +324,23 @@ cmp out.tar.lz aout.tar.lz || test_failed $LINENO
 "${TARLZ}" -0 -cf aout.tar.lz dir1/foo dir1/baz || test_failed $LINENO
 rm -rf dir1 || framework_failure
 "${TARLZ}" -xf aout.tar.lz dir1 || test_failed $LINENO
-cmp dir1/foo foo.orig || test_failed $LINENO
-cmp dir1/baz baz.orig || test_failed $LINENO
+cmp cfoo dir1/foo || test_failed $LINENO
+cmp cbaz dir1/baz || test_failed $LINENO
 rm -rf dir1 || framework_failure
 rm -f out.tar.lz aout.tar.lz || framework_failure
 
 # append to solid archive
-printf "foo" > foo || framework_failure
-printf "bar" > bar || framework_failure
-printf "baz" > baz || framework_failure
+cat cfoo > foo || framework_failure
+cat cbar > bar || framework_failure
+cat cbaz > baz || framework_failure
 "${TARLZ}" --solid -0 -cf out.tar.lz foo || test_failed $LINENO
+cat out.tar.lz > aout.tar.lz || framework_failure
 for i in --asolid --dsolid --solid -0 ; do
-	"${TARLZ}" $i -qrf out.tar.lz bar baz
+	"${TARLZ}" $i -q -rf out.tar.lz bar baz
 	[ $? = 2 ] || test_failed $LINENO $i
-	[ -e out.tar.lz ] || test_failed $LINENO $i
+	cmp out.tar.lz aout.tar.lz || test_failed $LINENO $i
 done
-rm -f out.tar.lz || framework_failure
+rm -f out.tar.lz aout.tar.lz || framework_failure
 for i in --asolid --dsolid -0 ; do
 	for j in --asolid --dsolid --solid -0 ; do
 		"${TARLZ}" $i -0 -cf out.tar.lz foo ||
@@ -280,14 +349,15 @@ for i in --asolid --dsolid -0 ; do
 			test_failed $LINENO "$i $j"
 		rm -f foo bar baz || framework_failure
 		"${TARLZ}" -xf out.tar.lz || test_failed $LINENO "$i $j"
-		cmp foo foo.orig || test_failed $LINENO "$i $j"
-		cmp bar bar.orig || test_failed $LINENO "$i $j"
-		cmp baz baz.orig || test_failed $LINENO "$i $j"
+		cmp cfoo foo || test_failed $LINENO "$i $j"
+		cmp cbar bar || test_failed $LINENO "$i $j"
+		cmp cbaz baz || test_failed $LINENO "$i $j"
 		rm -f out.tar.lz || framework_failure
 	done
 done
-rm -f foo foo.orig bar bar.orig baz baz.orig || framework_failure
+rm -f foo bar baz || framework_failure
 
+# test directories and links
 mkdir dir1 || framework_failure
 "${TARLZ}" -0 -cf out.tar dir1 || test_failed $LINENO
 rmdir dir1 || framework_failure
@@ -302,131 +372,222 @@ rmdir dir1 || framework_failure
 rmdir dir1
 rm -f out.tar || framework_failure
 
-if ln ${in} dummy_link 2> /dev/null &&
-   ln -s ${in} dummy_slink 2> /dev/null ; then
+touch dummy_file || framework_failure
+if ln dummy_file dummy_link 2> /dev/null &&
+   ln -s dummy_file dummy_slink 2> /dev/null ; then
+	ln_works=yes
 	name_100=name_100_bytes_long_nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
 	path_100=dir1/dir2/dir3/path_100_bytes_long_nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
 	path_106=dir1/dir2/dir3/path_longer_than_100_bytes_nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
 	mkdir dir1 || framework_failure
 	mkdir dir1/dir2 || framework_failure
 	mkdir dir1/dir2/dir3 || framework_failure
-	cat ${in} > dir1/dir2/dir3/in || framework_failure
-	ln dir1/dir2/dir3/in dir1/dir2/dir3/${name_100} || framework_failure
-	ln dir1/dir2/dir3/in ${path_100} || framework_failure
-	ln dir1/dir2/dir3/in ${path_106} || framework_failure
+	cat "${in}" > dir1/dir2/dir3/in || framework_failure
+	ln dir1/dir2/dir3/in dir1/dir2/dir3/"${name_100}" || framework_failure
+	ln dir1/dir2/dir3/in "${path_100}" || framework_failure
+	ln dir1/dir2/dir3/in "${path_106}" || framework_failure
 	ln -s in dir1/dir2/dir3/link || framework_failure
-	ln -s ${name_100} dir1/dir2/dir3/link_100 || framework_failure
+	ln -s "${name_100}" dir1/dir2/dir3/link_100 || framework_failure
 	"${TARLZ}" -0 -cf out.tar dir1 || test_failed $LINENO
 	rm -rf dir1 || framework_failure
 	"${TARLZ}" -xf out.tar || test_failed $LINENO
-	cmp ${in} dir1/dir2/dir3/in || test_failed $LINENO
-	cmp ${in} dir1/dir2/dir3/${name_100} || test_failed $LINENO
-	cmp ${in} ${path_100} || test_failed $LINENO
-	cmp ${in} ${path_106} || test_failed $LINENO
-	cmp ${in} dir1/dir2/dir3/link || test_failed $LINENO
-	cmp ${in} dir1/dir2/dir3/link_100 || test_failed $LINENO
+	cmp "${in}" dir1/dir2/dir3/in || test_failed $LINENO
+	cmp "${in}" dir1/dir2/dir3/"${name_100}" || test_failed $LINENO
+	cmp "${in}" "${path_100}" || test_failed $LINENO
+	cmp "${in}" "${path_106}" || test_failed $LINENO
+	cmp "${in}" dir1/dir2/dir3/link || test_failed $LINENO
+	cmp "${in}" dir1/dir2/dir3/link_100 || test_failed $LINENO
 	rm -f dir1/dir2/dir3/in || framework_failure
-	cmp ${in} dir1/dir2/dir3/link 2> /dev/null && test_failed $LINENO
-	cmp ${in} dir1/dir2/dir3/link_100 || test_failed $LINENO
+	cmp "${in}" dir1/dir2/dir3/link 2> /dev/null && test_failed $LINENO
+	cmp "${in}" dir1/dir2/dir3/link_100 || test_failed $LINENO
 	"${TARLZ}" -xf out.tar || test_failed $LINENO
 	rm -f out.tar || framework_failure
-	cmp ${in} dir1/dir2/dir3/in || test_failed $LINENO
-	cmp ${in} dir1/dir2/dir3/link || test_failed $LINENO
-	"${TARLZ}" -0 -qc ../tmp/dir1 > /dev/null || test_failed $LINENO
+	cmp "${in}" dir1/dir2/dir3/in || test_failed $LINENO
+	cmp "${in}" dir1/dir2/dir3/link || test_failed $LINENO
+	"${TARLZ}" -0 -q -c ../tmp/dir1 > /dev/null || test_failed $LINENO
 	rm -rf dir1 || framework_failure
 else
 	printf "\nwarning: skipping link test: 'ln' does not work on your system."
 fi
-rm -f dummy_link dummy_slink || framework_failure
+rm -f dummy_slink dummy_link dummy_file || framework_failure
+
+printf "\ntesting long names..."
+
+"${TARLZ}" -q -tf "${t155}" || test_failed $LINENO
+"${TARLZ}" -q -tf "${t155_lz}" || test_failed $LINENO
+if [ "${ln_works}" = yes ] ; then
+	mkdir dir1 || framework_failure
+	"${TARLZ}" -C dir1 -xf "${t155}" || test_failed $LINENO
+	mkdir dir2 || framework_failure
+	"${TARLZ}" -C dir2 -xf "${t155_lz}" || test_failed $LINENO
+	diff -r dir1 dir2 || test_failed $LINENO
+	rmdir dir2 2> /dev/null && test_failed $LINENO
+	rmdir dir1 2> /dev/null && test_failed $LINENO
+	rm -rf dir2 dir1 || framework_failure
+fi
+
+"${TARLZ}" -tvf "${testdir}"/ug32chars.tar.lz | grep -q \
+	-e very_long_owner_name_of_32_chars/very_long_group_name_of_32_chars ||
+	test_failed $LINENO
+"${TARLZ}" -tvf "${testdir}"/ug32chars.tar.lz | grep -q \
+	-e very_long_owner_name_of_32_charsvery_long_group_name_of_32_chars &&
+	test_failed $LINENO
+"${TARLZ}" -tvf "${testdir}"/ug32chars.tar.lz | grep -q \
+	-e very_long_group_name_of_32_chars/very_long_group_name_of_32_chars &&
+	test_failed $LINENO
+"${TARLZ}" -xf "${testdir}"/ug32chars.tar.lz || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+rm -f foo || framework_failure
+
+printf "\ntesting bad input..."
 
-"${TARLZ}" -qxf "${testdir}"/dotdot1.tar.lz || test_failed $LINENO
+"${TARLZ}" -q -xf "${testdir}"/dotdot1.tar.lz || test_failed $LINENO
 [ ! -e ../dir ] || test_failed $LINENO
-"${TARLZ}" -qxf "${testdir}"/dotdot2.tar.lz || test_failed $LINENO
+"${TARLZ}" -q -xf "${testdir}"/dotdot2.tar.lz || test_failed $LINENO
 [ ! -e ../dir ] || test_failed $LINENO
-"${TARLZ}" -qxf "${testdir}"/dotdot3.tar.lz || test_failed $LINENO
+"${TARLZ}" -q -xf "${testdir}"/dotdot3.tar.lz || test_failed $LINENO
 [ ! -e dir ] || test_failed $LINENO
-"${TARLZ}" -qxf "${testdir}"/dotdot4.tar.lz || test_failed $LINENO
+"${TARLZ}" -q -xf "${testdir}"/dotdot4.tar.lz || test_failed $LINENO
 [ ! -e dir ] || test_failed $LINENO
-"${TARLZ}" -qxf "${testdir}"/dotdot5.tar.lz || test_failed $LINENO
+"${TARLZ}" -q -xf "${testdir}"/dotdot5.tar.lz || test_failed $LINENO
 [ ! -e dir ] || test_failed $LINENO
 
-printf "\ntesting bad input..."
-
-dd if=${in_tar} of=truncated.tar bs=1000 count=1 2> /dev/null
-"${TARLZ}" -qtf truncated.tar > /dev/null
+dd if="${in_tar}" of=truncated.tar bs=1000 count=1 2> /dev/null
+"${TARLZ}" -q -tf truncated.tar > /dev/null
 [ $? = 2 ] || test_failed $LINENO
-"${TARLZ}" -qxf truncated.tar
+"${TARLZ}" -q -xf truncated.tar
 [ $? = 2 ] || test_failed $LINENO
 [ ! -e test.txt ] || test_failed $LINENO
+rm -f truncated.tar || framework_failure
 
+# test compressed and --keep-damaged
+rm -f test.txt || framework_failure
+for i in "${inbad1}" "${inbad2}" ; do
+	"${TARLZ}" -q -xf "${i}.tar.lz"
+	[ $? = 2 ] || test_failed $LINENO "${i}"
+	[ ! -e test.txt ] || test_failed $LINENO "${i}"
+	rm -f test.txt || framework_failure
+	"${TARLZ}" -q -xf "${i}.tar.lz" --keep-damaged
+	[ $? = 2 ] || test_failed $LINENO "${i}"
+	[ -e test.txt ] || test_failed $LINENO "${i}"
+	cmp "${i}" test.txt 2> /dev/null || lzlib_1_11 "$LINENO ${i}"
+	rm -f test.txt || framework_failure
+done
+#
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad1_lz}
+"${TARLZ}" -q -xf "${bad1_lz}"
 [ $? = 2 ] || test_failed $LINENO
 [ ! -e foo ] || test_failed $LINENO
-[ -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad2_lz}
+"${TARLZ}" -q -xf "${bad2_lz}"
 [ $? = 2 ] || test_failed $LINENO
 [ ! -e foo ] || test_failed $LINENO
-[ -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad3_lz}
+"${TARLZ}" -q -xf "${bad3_lz}"
 [ $? = 2 ] || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
 [ ! -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
+rm -f foo bar baz || framework_failure
+"${TARLZ}" -q -xf "${bad3_lz}" --keep-damaged
+[ $? = 2 ] || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar 2> /dev/null || lzlib_1_11 $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad4_lz}
+"${TARLZ}" -q -xf "${bad4_lz}"
 [ $? = 2 ] || test_failed $LINENO
 [ ! -e foo ] || test_failed $LINENO
 [ ! -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad5_lz}
+"${TARLZ}" -q -xf "${bad4_lz}" --keep-damaged
+[ $? = 2 ] || test_failed $LINENO
+[ ! -e foo ] || test_failed $LINENO
+cmp cbar bar 2> /dev/null || lzlib_1_11 $LINENO
+cmp cbaz baz || test_failed $LINENO
+rm -f foo bar baz || framework_failure
+"${TARLZ}" -q -xf "${bad5_lz}"
 [ $? = 2 ] || test_failed $LINENO
 [ ! -e foo ] || test_failed $LINENO
 [ ! -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad6_lz}
+"${TARLZ}" -q -xf "${bad5_lz}" --keep-damaged
 [ $? = 2 ] || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
-[ -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cfoo foo 2> /dev/null || lzlib_1_11 $LINENO
+[ ! -e bar ] || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
+rm -f foo bar baz || framework_failure
+"${TARLZ}" -q -xf "${bad6_lz}"
+[ $? = 2 ] || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 
+# test uncompressed and --keep-damaged
+rm -f test.txt || framework_failure
+"${TARLZ}" -q -xf "${inbad1}.tar"
+[ $? = 2 ] || test_failed $LINENO
+[ ! -e test.txt ] || test_failed $LINENO
+rm -f test.txt || framework_failure
+"${TARLZ}" -q -xf "${inbad1}.tar" --keep-damaged
+[ $? = 2 ] || test_failed $LINENO
+[ -e test.txt ] || test_failed $LINENO
+cmp "${inbad1}" test.txt 2> /dev/null || test_failed $LINENO
+rm -f test.txt || framework_failure
+#
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad1}
+"${TARLZ}" -q -xf "${bad1}"
 [ $? = 2 ] || test_failed $LINENO
 [ ! -e foo ] || test_failed $LINENO
-[ -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad2}
+"${TARLZ}" -q -xf "${bad2}"
 [ $? = 2 ] || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
 [ ! -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad3}
+"${TARLZ}" -q -xf "${bad3}"
 [ $? = 2 ] || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
-[ -e bar ] || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
 [ ! -e baz ] || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad4}
+"${TARLZ}" -q -xf "${bad4}"
 [ $? = 2 ] || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
+cmp cfoo foo || test_failed $LINENO
 [ ! -e bar ] || test_failed $LINENO
 [ ! -e baz ] || test_failed $LINENO
 rm -f foo bar baz || framework_failure
-"${TARLZ}" -qxf ${bad5}
+"${TARLZ}" -q -xf "${bad5}"
 [ $? = 2 ] || test_failed $LINENO
-[ -e foo ] || test_failed $LINENO
-[ -e bar ] || test_failed $LINENO
-[ -e baz ] || test_failed $LINENO
-rm -f foo bar baz || framework_failure
+cmp cfoo foo || test_failed $LINENO
+cmp cbar bar || test_failed $LINENO
+cmp cbaz baz || test_failed $LINENO
+rm -f cfoo cbar cbaz foo bar baz || framework_failure
+#
+rm -f test3.tar.lz || framework_failure
+"${TARLZ}" -q -xf "${tlzit1}"
+[ $? = 2 ] || test_failed $LINENO
+[ ! -e foo ] || test_failed $LINENO
+[ ! -e bar ] || test_failed $LINENO
+[ ! -e baz ] || test_failed $LINENO
+[ ! -e test3.tar.lz ] || test_failed $LINENO
+rm -f foo bar baz test3.tar.lz || framework_failure
+"${TARLZ}" -q -xf "${tlzit2}"
+[ $? = 2 ] || test_failed $LINENO
+[ ! -e foo ] || test_failed $LINENO
+[ ! -e bar ] || test_failed $LINENO
+[ ! -e baz ] || test_failed $LINENO
+cmp "${test3_lz}" test3.tar.lz || test_failed $LINENO
+rm -f foo bar baz test3.tar.lz || framework_failure
 
 echo
 if [ ${fail} = 0 ] ; then
-- 
cgit v1.2.3