find(1): Fix -newer and -samefile to conform to POSIX[0]
By default, or with the -P flag, find(1) should evaluate paths "physically." For symlinks, this means using the link itself instead of the target. Historically (since the import of BSD 4.4-lite from CSRG), find(1) has failed to refer to the link itself, at least for -newer and -samefile. [0]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/find.html PR: 222698 Reported by: Harald Schmalzbauer <bugzilla.freebsd AT omnilan.de> Sponsored by: Dell EMC Isilon
This commit is contained in:
parent
cad0074dd6
commit
d8a0fe102c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=327362
@ -8,4 +8,7 @@ YFLAGS=
|
||||
|
||||
NO_WMISSING_VARIABLE_DECLARATIONS=
|
||||
|
||||
#HAS_TESTS=
|
||||
#SUBDIR.${MK_TESTS}+= tests
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -1066,12 +1066,17 @@ c_samefile(OPTION *option, char ***argvp)
|
||||
char *fn;
|
||||
PLAN *new;
|
||||
struct stat sb;
|
||||
int error;
|
||||
|
||||
fn = nextarg(option, argvp);
|
||||
ftsoptions &= ~FTS_NOSTAT;
|
||||
|
||||
new = palloc(option);
|
||||
if (stat(fn, &sb))
|
||||
if (ftsoptions & FTS_PHYSICAL)
|
||||
error = lstat(fn, &sb);
|
||||
else
|
||||
error = stat(fn, &sb);
|
||||
if (error != 0)
|
||||
err(1, "%s", fn);
|
||||
new->i_data = sb.st_ino;
|
||||
return new;
|
||||
@ -1201,6 +1206,7 @@ c_newer(OPTION *option, char ***argvp)
|
||||
char *fn_or_tspec;
|
||||
PLAN *new;
|
||||
struct stat sb;
|
||||
int error;
|
||||
|
||||
fn_or_tspec = nextarg(option, argvp);
|
||||
ftsoptions &= ~FTS_NOSTAT;
|
||||
@ -1214,7 +1220,11 @@ c_newer(OPTION *option, char ***argvp)
|
||||
/* Use the seconds only in the comparison. */
|
||||
new->t_data.tv_nsec = 999999999;
|
||||
} else {
|
||||
if (stat(fn_or_tspec, &sb))
|
||||
if (ftsoptions & FTS_PHYSICAL)
|
||||
error = lstat(fn_or_tspec, &sb);
|
||||
else
|
||||
error = stat(fn_or_tspec, &sb);
|
||||
if (error != 0)
|
||||
err(1, "%s", fn_or_tspec);
|
||||
if (option->flags & F_TIME2_C)
|
||||
new->t_data = sb.st_ctim;
|
||||
|
5
usr.bin/find/tests/Makefile
Normal file
5
usr.bin/find/tests/Makefile
Normal file
@ -0,0 +1,5 @@
|
||||
# $FreeBSD$
|
||||
|
||||
ATF_TESTS_SH= find_test
|
||||
|
||||
.include <bsd.test.mk>
|
73
usr.bin/find/tests/find_test.sh
Executable file
73
usr.bin/find/tests/find_test.sh
Executable file
@ -0,0 +1,73 @@
|
||||
#
|
||||
# Copyright 2017, Conrad Meyer <cem@FreeBSD.org>.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * 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 COPYRIGHT HOLDERS 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 COPYRIGHT
|
||||
# OWNER 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 find_newer_link
|
||||
find_newer_link_head()
|
||||
{
|
||||
atf_set "descr" "Verifies that -newer correctly uses a symlink, " \
|
||||
"rather than its target, for comparison"
|
||||
}
|
||||
find_newer_link_body()
|
||||
{
|
||||
atf_check -s exit:0 mkdir test
|
||||
atf_check -s exit:0 ln -s file1 test/link
|
||||
atf_check -s exit:0 sleep 1.1
|
||||
atf_check -s exit:0 touch test/file2
|
||||
atf_check -s exit:0 sleep 1.1
|
||||
atf_check -s exit:0 touch test/file1
|
||||
|
||||
# find(1) should evaluate 'link' as a symlink rather than its target
|
||||
# (with -P / without -L flags). Since link was created first, the
|
||||
# other two files should be newer.
|
||||
echo -e "test\ntest/file1\ntest/file2" > expout
|
||||
atf_check -s exit:0 -o save:output find test -newer test/link
|
||||
atf_check -s exit:0 -o file:expout sort < output
|
||||
}
|
||||
|
||||
atf_test_case find_samefile_link
|
||||
find_samefile_link_head()
|
||||
{
|
||||
atf_set "descr" "Verifies that -samefile correctly uses a symlink, " \
|
||||
"rather than its target, for comparison"
|
||||
}
|
||||
find_samefile_link_body()
|
||||
{
|
||||
atf_check -s exit:0 mkdir test
|
||||
atf_check -s exit:0 touch test/file3
|
||||
atf_check -s exit:0 ln -s file3 test/link2
|
||||
|
||||
# find(1) should evaluate 'link' as a symlink rather than its target
|
||||
# (with -P / without -L flags).
|
||||
atf_check -s exit:0 -o "inline:test/link2\n" find test -samefile test/link2
|
||||
}
|
||||
|
||||
atf_init_test_cases()
|
||||
{
|
||||
atf_add_test_case find_newer_link
|
||||
atf_add_test_case find_samefile_link
|
||||
}
|
Loading…
Reference in New Issue
Block a user