From 48fe8b80e2592f26cae686b0b99547b76018aeb1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 28 Dec 2018 10:51:38 +0100 Subject: Adding upstream version 0.8. Signed-off-by: Daniel Baumann --- testsuite/check.sh | 489 +++++++++++++++++++++++++++-------------- testsuite/t155.tar | Bin 0 -> 6144 bytes testsuite/t155.tar.lz | Bin 0 -> 579 bytes testsuite/test3_bad3.tar.lz | Bin 356 -> 356 bytes testsuite/test3_bad4.tar.lz | Bin 356 -> 356 bytes testsuite/test3_dir.tar.lz | Bin 0 -> 358 bytes testsuite/test3_dot.tar.lz | Bin 0 -> 349 bytes testsuite/test3a.tar.lz | Bin 358 -> 0 bytes testsuite/test_bad1.txt | 307 ++++++++++++++++++++++++++ testsuite/test_bad1.txt.tar | Bin 0 -> 17014 bytes testsuite/test_bad1.txt.tar.lz | Bin 0 -> 6000 bytes testsuite/test_bad2.txt | 320 +++++++++++++++++++++++++++ testsuite/test_bad2.txt.tar.lz | Bin 0 -> 7495 bytes testsuite/tlz_in_tar1.tar | Bin 0 -> 2048 bytes testsuite/tlz_in_tar2.tar | Bin 0 -> 3072 bytes testsuite/ug32chars.tar.lz | Bin 0 -> 175 bytes 16 files changed, 952 insertions(+), 164 deletions(-) create mode 100644 testsuite/t155.tar create mode 100644 testsuite/t155.tar.lz create mode 100644 testsuite/test3_dir.tar.lz create mode 100644 testsuite/test3_dot.tar.lz delete mode 100644 testsuite/test3a.tar.lz create mode 100644 testsuite/test_bad1.txt create mode 100644 testsuite/test_bad1.txt.tar create mode 100644 testsuite/test_bad1.txt.tar.lz create mode 100644 testsuite/test_bad2.txt create mode 100644 testsuite/test_bad2.txt.tar.lz create mode 100644 testsuite/tlz_in_tar1.tar create mode 100644 testsuite/tlz_in_tar2.tar create mode 100644 testsuite/ug32chars.tar.lz (limited to 'testsuite') 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 diff --git a/testsuite/t155.tar b/testsuite/t155.tar new file mode 100644 index 0000000..4a0f37b Binary files /dev/null and b/testsuite/t155.tar differ diff --git a/testsuite/t155.tar.lz b/testsuite/t155.tar.lz new file mode 100644 index 0000000..3219071 Binary files /dev/null and b/testsuite/t155.tar.lz differ diff --git a/testsuite/test3_bad3.tar.lz b/testsuite/test3_bad3.tar.lz index c711a1a..3b46163 100644 Binary files a/testsuite/test3_bad3.tar.lz and b/testsuite/test3_bad3.tar.lz differ diff --git a/testsuite/test3_bad4.tar.lz b/testsuite/test3_bad4.tar.lz index 226db72..7ac6d98 100644 Binary files a/testsuite/test3_bad4.tar.lz and b/testsuite/test3_bad4.tar.lz differ diff --git a/testsuite/test3_dir.tar.lz b/testsuite/test3_dir.tar.lz new file mode 100644 index 0000000..8eb3f43 Binary files /dev/null and b/testsuite/test3_dir.tar.lz differ diff --git a/testsuite/test3_dot.tar.lz b/testsuite/test3_dot.tar.lz new file mode 100644 index 0000000..3ff8960 Binary files /dev/null and b/testsuite/test3_dot.tar.lz differ diff --git a/testsuite/test3a.tar.lz b/testsuite/test3a.tar.lz deleted file mode 100644 index 8eb3f43..0000000 Binary files a/testsuite/test3a.tar.lz and /dev/null differ diff --git a/testsuite/test_bad1.txt b/testsuite/test_bad1.txt new file mode 100644 index 0000000..f8463f4 --- /dev/null +++ b/testsuite/test_bad1.txt @@ -0,0 +1,307 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program \ No newline at end of file diff --git a/testsuite/test_bad1.txt.tar b/testsuite/test_bad1.txt.tar new file mode 100644 index 0000000..dc2140e Binary files /dev/null and b/testsuite/test_bad1.txt.tar differ diff --git a/testsuite/test_bad1.txt.tar.lz b/testsuite/test_bad1.txt.tar.lz new file mode 100644 index 0000000..f14173d Binary files /dev/null and b/testsuite/test_bad1.txt.tar.lz differ diff --git a/testsuite/test_bad2.txt b/testsuite/test_bad2.txt new file mode 100644 index 0000000..452408f --- /dev/null +++ b/testsuite/test_bad2.txt @@ -0,0 +1,320 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. Ifodifnperived from the Progr"work based on therogrdifneneraeuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT X FR TO NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT X FR TO NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARQIS NO WARRATHERE IS NO WARRANTY +FOR THE + + This ee \ No newline at end of file diff --git a/testsuite/test_bad2.txt.tar.lz b/testsuite/test_bad2.txt.tar.lz new file mode 100644 index 0000000..5d30ebf Binary files /dev/null and b/testsuite/test_bad2.txt.tar.lz differ diff --git a/testsuite/tlz_in_tar1.tar b/testsuite/tlz_in_tar1.tar new file mode 100644 index 0000000..f2dfd6c Binary files /dev/null and b/testsuite/tlz_in_tar1.tar differ diff --git a/testsuite/tlz_in_tar2.tar b/testsuite/tlz_in_tar2.tar new file mode 100644 index 0000000..be860c6 Binary files /dev/null and b/testsuite/tlz_in_tar2.tar differ diff --git a/testsuite/ug32chars.tar.lz b/testsuite/ug32chars.tar.lz new file mode 100644 index 0000000..1397b23 Binary files /dev/null and b/testsuite/ug32chars.tar.lz differ -- cgit v1.2.3