From nobody Sun Sep 18 06:27:13 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MVdBn3cbXz4c31h; Sun, 18 Sep 2022 06:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MVdBn2z4Hz3Yp0; Sun, 18 Sep 2022 06:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663482433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=89vpNTFme0iXySqVkjk+unNnKAw1QDtBrsFszhbZMQw=; b=QXAW8itV62Wy45F9icLftNT0I5aGznhw4kCNc/lNCW8GcvlVPZTDNYXJJCv+bu7B5HoVCp Nzjbk1JBFmg+CsZx86GH8Kc0NalQ6XmPtuOYSGFUPvCMvhipYS7wgQmUy14ykyM5ftBoQI qDoJSBb4Fl0NkFiAYlgtYvqLVTOR8agr2lwKCWDNB5H3riAmhiUhQHqvQsPJSgg6zE1PWz /hsrrVeWHhGTmW4H2Ce60sA2xcasL0enmHvNAiS+2uIbUxZFC6PCSaEoh8sTSa7nWffJPZ ObXriSoYdlebLxbrzLnBE2WVHFD4eB8x7+qtkQOm8lPXpLRJh68c4bSdMi+p0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MVdBn1zLFzxYF; Sun, 18 Sep 2022 06:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28I6RDfD068166; Sun, 18 Sep 2022 06:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28I6RDH5068165; Sun, 18 Sep 2022 06:27:13 GMT (envelope-from git) Date: Sun, 18 Sep 2022 06:27:13 GMT Message-Id: <202209180627.28I6RDH5068165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 56f9e6ff1dca - stable/12 - zdiff: avoid non-conformant features List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 56f9e6ff1dcaa23928089e382c6e21cf821b9ca1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663482433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=89vpNTFme0iXySqVkjk+unNnKAw1QDtBrsFszhbZMQw=; b=easIIqhNHKagpa3o6Sg2rR88HcDU+kXUYcYw37C6bjflmLQ2mqWEQd5gaOw8TUYp9anSUd 19qyLazshjr2lMkIzBKIIR6mUsIS/8mqJvXTAHF5Moo/JSx8EcGWoB09OJtFuxZh5wq+kj 9gXyNItfcv4+1G8Rof7ZxnE80jGgz2+p7ph3TXEUo+V/yungbug1RL+pH77fbYqna/glQU QM7/UcY5WCUle6ycM0Spe30UKUeb8O/gq8KK86d+SA5K0l9mz+h3nrBN2ikG/l5slsSFWy DiS3l4DhBBGqD0IHlTJTUHfdAvyoiPKJXmin9tnVocAeiAVa5cswVB471XiJPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663482433; a=rsa-sha256; cv=none; b=uGuIFibIf2sNzfTBz9/mjS7Ret1X5Pnc1qqJF+0tLf1IJhvjyfbecIn6wK9GbDGWbubOm8 xAEph8D25rQx7licaDx33GQcTVxuMrlMstpTHnaofe53BolknntTCRgPCLA3FeWHwJqkd7 bt/G90C6LbVoI4J2CJkHk5w2FQIo7agC/VDBm32AbBzmqDyCUa+3ZhjQTOPId+eNHYbOMg peiUhXJTzADurDb/Siga9vGrueTIrLTUJdF7P9FwzkLDdMduKzZ372MP9akHWK5Ys6BvBr 7na5lXCjZFHSWKH7u3//xYPLII4sxmxguRb6fWQyr2RVVtw+JyDh1e3pfxdK5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=56f9e6ff1dcaa23928089e382c6e21cf821b9ca1 commit 56f9e6ff1dcaa23928089e382c6e21cf821b9ca1 Author: Kyle Evans AuthorDate: 2022-05-20 20:38:03 +0000 Commit: Kyle Evans CommitDate: 2022-09-17 19:29:44 +0000 zdiff: avoid non-conformant features `setvar` is a non-conformant feature that looks slightly neater but is not portable to other /bin/sh implementations. Making the script portable is straightforward, so let's do it. Tests are added to make sure that I didn't break anything major in the process. Reviewed by: bapt (previous version), jilles Sponsored by: Klara, Inc. (cherry picked from commit 5b7adeb1845c7491a655d2b2e1ab55d7b7b96a34) --- usr.bin/gzip/tests/Makefile | 5 ++ usr.bin/gzip/tests/foo.diff | 2 + usr.bin/gzip/tests/zdiff_test.sh | 125 +++++++++++++++++++++++++++++++++++++++ usr.bin/gzip/zdiff | 44 +++++++------- 4 files changed, 154 insertions(+), 22 deletions(-) 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 @@ -2,8 +2,13 @@ .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 @@ -38,48 +38,48 @@ 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 }