80445b7a3f
-s causes cmp to print nothing for differing files, for use when only
the exit status is of interest.
-z compares the file size first, for regular files, and fails the
comparison early if they do not match.
Prior to this change -s implied -z as an optimization, but this is not
valid when file offsets are specified. Now, enable the -z optimization
for -s only if both skip arguments are not provided / 0.
Note that using -z with differing skip values will currently always
fail. We may want to compare size1 - skip1 with size2 - skip2 instaead,
and in any case the man page should be clarified.
PR: 252542
Fixes: 3e6902efc8
Reported by: William Ahern
Reviewed by: markj
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D28071
84 lines
2.8 KiB
Bash
Executable File
84 lines
2.8 KiB
Bash
Executable File
# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
#
|
|
# Copyright (c) 2017 Alan Somers
|
|
#
|
|
# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
|
|
#
|
|
# $FreeBSD$
|
|
|
|
atf_test_case special
|
|
special_head() {
|
|
atf_set "descr" "Test cmp(1)'s handling of non-regular files"
|
|
}
|
|
special_body() {
|
|
echo 0123456789abcdef > a
|
|
echo 0123456789abcdeg > b
|
|
atf_check -s exit:0 -o empty -e empty -x "cat a | cmp a -"
|
|
atf_check -s exit:0 -o empty -e empty -x "cat a | cmp - a"
|
|
atf_check -s exit:1 -o not-empty -e empty -x "cat b | cmp a -"
|
|
atf_check -s exit:1 -o not-empty -e empty -x "cat b | cmp - a"
|
|
|
|
atf_check -s exit:0 -o empty -e empty -x "cmp a a <&-"
|
|
}
|
|
|
|
atf_test_case symlink
|
|
symlink_head() {
|
|
atf_set "descr" "Test cmp(1)'s handling of symlinks"
|
|
}
|
|
symlink_body() {
|
|
echo 0123456789abcdef > a
|
|
echo 0123456789abcdeg > b
|
|
ln -s a a.lnk
|
|
ln -s b b.lnk
|
|
ln -s a a2.lnk
|
|
cp a adup
|
|
ln -s adup adup.lnk
|
|
atf_check -s exit:0 cmp a a.lnk
|
|
atf_check -s exit:0 cmp a.lnk a
|
|
atf_check -s not-exit:0 -o ignore cmp a b.lnk
|
|
atf_check -s not-exit:0 -o ignore cmp b.lnk a
|
|
atf_check -s not-exit:0 -o ignore -e ignore cmp -h a a.lnk
|
|
atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk a
|
|
atf_check -s exit:0 cmp -h a.lnk a2.lnk
|
|
atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk adup.lnk
|
|
}
|
|
|
|
atf_test_case pr252542
|
|
pr252542_head()
|
|
{
|
|
atf_set "descr" "Test cmp(1) -s with file offset skips"
|
|
}
|
|
pr252542_body()
|
|
{
|
|
echo -n '1234567890' > a
|
|
echo -n 'abc567890' > b
|
|
atf_check -s exit:0 cmp -s a b 4 3
|
|
atf_check -s exit:1 -o ignore cmp -z a b 4 3
|
|
}
|
|
|
|
atf_init_test_cases()
|
|
{
|
|
atf_add_test_case special
|
|
atf_add_test_case symlink
|
|
atf_add_test_case pr252542
|
|
}
|