diff --git a/usr.bin/gzip/tests/Makefile b/usr.bin/gzip/tests/Makefile index 03a5852b3ff0..ede51a9c6c42 100644 --- a/usr.bin/gzip/tests/Makefile +++ b/usr.bin/gzip/tests/Makefile @@ -1,9 +1,14 @@ # $FreeBSD$ .include +PACKAGE= tests + +ATF_TESTS_SH= zdiff_test NETBSD_ATF_TESTS_SH= gzip_test +${PACKAGE}FILES+= foo.diff + .include .include diff --git a/usr.bin/gzip/tests/foo.diff b/usr.bin/gzip/tests/foo.diff new file mode 100644 index 000000000000..278d14088435 --- /dev/null +++ b/usr.bin/gzip/tests/foo.diff @@ -0,0 +1,2 @@ +1a2 +> bar diff --git a/usr.bin/gzip/tests/zdiff_test.sh b/usr.bin/gzip/tests/zdiff_test.sh new file mode 100644 index 000000000000..ef1bcb278998 --- /dev/null +++ b/usr.bin/gzip/tests/zdiff_test.sh @@ -0,0 +1,125 @@ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2022 Kyle Evans +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +specials="foo'bar foo\"bar foo\$bar" + +prepare_files() +{ + compressfunc="$1" + compresssuffix="$2" + + echo "foo" > foo + + for f in $specials foo; do + [ "$f" == "foo" ] || cp foo "$f" + atf_check "$compressfunc" -k "$f" + atf_check tar -ckf "$f.tar" "$f" + atf_check -o save:"$f.$compresssuffix" \ + "$compressfunc" -c "$f.tar" + + # Regenerate $f.tar to create a diff from the .$compresssuffix + # file, too. + echo "bar" >> "$f" + atf_check tar -ckf "$f.tar" "$f" + done +} + +atf_test_case gzip +gzip_body() +{ + prepare_files gzip tgz + cp foo.gz foo.Z + + for f in foo $specials; do + atf_check -s exit:1 -o file:"$(atf_get_srcdir)"/foo.diff \ + zdiff "$f.gz" + done + + atf_check -s exit:1 -o file:"$(atf_get_srcdir)"/foo.diff zdiff foo.Z + + for f in foo $specials; do + rm "$f" + atf_check -s exit:1 -o match:"Binary files" zdiff "$f.tgz" + done +} + +atf_test_case bzip +bzip_body() +{ + prepare_files bzip2 tbz2 + cp foo.bz2 foo.bz + + for f in foo $specials; do + atf_check -s exit:1 -o file:"$(atf_get_srcdir)"/foo.diff \ + zdiff "$f.bz2" + done + + atf_check -s exit:1 -o file:"$(atf_get_srcdir)"/foo.diff zdiff foo.bz + + for f in foo $specials; do + rm "$f" + atf_check -s exit:1 -o match:"Binary files" zdiff "$f.tbz2" + done +} + +atf_test_case xzip +xzip_body() +{ + prepare_files xz txz + cp foo.xz foo.lzma + + for f in foo $specials; do + atf_check -s exit:1 -o file:"$(atf_get_srcdir)"/foo.diff \ + zdiff "$f.xz" + done + + atf_check -s exit:1 -o file:"$(atf_get_srcdir)"/foo.diff zdiff foo.lzma + + for f in foo $specials; do + rm "$f" + atf_check -s exit:1 -o match:"Binary files" zdiff "$f.txz" + done +} + +atf_test_case unknown +unknown_body() +{ + prepare_files xz fxz + + for f in foo $specials; do + atf_check -s exit:1 -e match:"unknown suffix$" zdiff "$f.fxz" + done +} + +atf_init_test_cases() +{ + + atf_add_test_case gzip + atf_add_test_case bzip + atf_add_test_case xzip + atf_add_test_case unknown +} diff --git a/usr.bin/gzip/zdiff b/usr.bin/gzip/zdiff index 9e9aca677e25..f9ea9a349c99 100644 --- a/usr.bin/gzip/zdiff +++ b/usr.bin/gzip/zdiff @@ -1,142 +1,142 @@ #!/bin/sh - # # $NetBSD: zdiff,v 1.5 2010/04/14 20:30:28 joerg Exp $ # # $OpenBSD: zdiff,v 1.2 2003/07/29 07:42:44 otto Exp $ # #- # Copyright (c) 2003 Todd C. Miller # Copyright (c) 2010 Joerg Sonnenberger # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. # # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Sponsored in part by the Defense Advanced Research Projects # Agency (DARPA) and Air Force Research Laboratory, Air Force # Materiel Command, USAF, under agreement number F39502-99-1-0512. # # $FreeBSD$ # Set $prog based on $0 case $0 in *cmp) prog=cmp ;; *) prog=diff ;; esac USAGE="usage: $0 [options] file1 [file2]" check_suffix() { case "$1" in *[._-][Zz]) - setvar $2 "${1%??}" - setvar $3 "gzip -cdqf" + eval "$2=\${1%??}" + eval "$3=\"gzip -cdqf\"" ;; *[._-]bz) - setvar $2 "${1%???}" - setvar $3 "bzip2 -cdqf" + eval "$2=\${1%???}" + eval "$3=\"bzip2 -cdqf\"" ;; *[._-]gz) - setvar $2 "${1%???}" - setvar $3 "gzip -cdqf" + eval "$2=\${1%???}" + eval "$3=\"gzip -cdqf\"" ;; *[._-]xz) - setvar $2 "${1%???}" - setvar $3 "xz -cdqf" + eval "$2=\${1%???}" + eval "$3=\"xz -cdqf\"" ;; *[._-]bz2) - setvar $2 "${1%????}" - setvar $3 "bzip2 -cdqf" + eval "$2=\${1%????}" + eval "$3=\"bzip2 -cdqf\"" ;; *[._-]lzma) - setvar $2 "${1%?????}" - setvar $3 "xz -cdqf" + eval "$2=\${1%?????}" + eval "$3=\"xz -cdqf\"" ;; *.t[ag]z) - setvar $2 "${1%??}"ar - setvar $3 "gzip -cdqf" + eval "$2=\${1%??}ar" + eval "$3=\"gzip -cdqf\"" ;; *.tbz) - setvar $2 "${1%??}"ar - setvar $3 "bzip2 -cdqf" + eval "$2=\${1%??}ar" + eval "$3=\"bzip2 -cdqf\"" ;; *.tbz2) - setvar $2 "${1%???}"ar - setvar $3 "bzip2 -cdqf" + eval "$2=\${1%???}ar" + eval "$3=\"bzip2 -cdqf\"" ;; *.t[lx]z) - setvar $2 "${1%??}"ar - setvar $3 "xz -cdqf" + eval "$2=\${1%??}ar" + eval "$3=\"xz -cdqf\"" ;; *) - setvar $2 "$1" - setvar $3 "" + eval "$2=\$1" + eval "$3=\"\"" ;; esac } # Pull out any command line flags so we can pass them to diff/cmp # XXX - assumes there is no optarg flags= while test $# -ne 0; do case "$1" in --) shift break ;; -) break ;; -*) flags="$flags $1" shift ;; *) break ;; esac done if [ $# -eq 1 ]; then # One file given, compare compressed to uncompressed files="$1" check_suffix "$1" files filt if [ -z "$filt" ]; then echo "z$prog: unknown suffix" 1>&2 exit 1 fi $filt -- "$1" | $prog $flags -- - "$files" status=$? elif [ $# -eq 2 ]; then # Two files given, compare the two uncompressing as needed check_suffix "$1" files filt check_suffix "$2" files2 filt2 if [ -z "$filt" -a -z "$filt2" ]; then $prog $flags -- "$1" "$2" elif [ -z "$filt" -a -n "$filt2" -a "$1" != "-" ]; then $filt2 -- "$2" | $prog $flags -- "$1" - elif [ -n "$filt" -a -z "$filt2" -a "$2" != "-" ]; then $filt -- "$1" | $prog $flags -- - "$2" else tmp=`mktemp -t z$prog.XXXXXXXXXX` || exit 1 trap "rm -f $tmp" 0 1 2 3 13 15 ${filt2:-cat} -- "$2" > $tmp || exit $? ${filt:-cat} -- "$1" | $prog $flags -- - "$tmp" fi status=$? else echo "$USAGE" 1>&2 exit 1 fi exit $status