mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-03-28 15:54:58 +02:00
1e9098dc83
I started with the patches from Red Hat. The entries below tell how the code evolved. * src/ls.c (print_long_format, print_file_name_and_frills): When there is no security context (due to getfilecon/lgetfilecon failing with e.g. ENOTSUP), print it as "?", not "". * src/ls.c (print_file_name_and_frills): Make -Z work without -l. (length_of_file_name_and_frills): Likewise. * src/ls.c: Remove the --lcontext and --scontext options. Change the way -Z, --context work so that it no longer implies -l. Thus, -Z -l will work like -lcontext and -Z without -l will work like --scontext. Adjust tests to reflect new 'ls -l' syntax -- affects only systems with SELinux when operating on a file with no ACL. These tests assumed that everything before the first space on each line is the 10-byte mode string. But there may also be a "+" in the 11th column, just before the space. However, note that this is not new. The same thing would have happened even without the change below, when listing a file with an ACL. * tests/chmod/equals, tests/cp/cp-parents, tests/cp/fail-perm: * tests/cp/link-preserve, tests/install/basic-1, tests/misc/mknod: * tests/mkdir/parents, tests/mkdir/special-1, tests/mv/partition-perm: Don't make compilation depend on USE_ACL. An SELinux security context counts as an "alternate access control method", so ls must output a "+" for each file with a security context. * src/ls.c [struct fileinfo] (have_acl): Declare unconditionally. (FILE_HAS_ACL): Remove macro definition. Use f->have_acl directly. (gobble_file): Record whether a file has a security context, and update the condition used to determine whether to print the "+". (gobble_file): Call getfilecon/lgetfilecon also when format == long_format, so that we get the "+". * src/ls.c (gobble_file): Add a comment explaining why (with a security context option) ls doesn't exit nonzero due to e.g., getfilecon failing with errno == ENOTSUP. * src/ls.c (gobble_file): Ignore failure of getfilecon if it's due to ENOTSUP. * src/ls.c (gobble_file): Factor out three small blocks using getfilecon and lgetfilecon. Don't ignore return value from getfilecon and lgetfilecon. * src/ls.c (print_long_format): Don't use ?: (empty 2nd arg with C ternary operator). (print_scontext_format): Likewise. (print_scontext): Declare to be "bool", not int. Adjust uses. * src/Makefile.am (dir_LDADD, ls_LDADD, vdir_LDADD): Add $(LIB_SELINUX). * tests/misc/chcon: New file. * tests/misc/chcon-fail: New file. * tests/Makefile.am (check-root): Run new, root-only misc/chcon test. * tests/misc/Makefile.am (TESTS): Add chcon and chcon-fail. * tests/misc/Makefile.am (TESTS): Add selinux. * tests/misc/selinux: New file. * tests/help-version: Skip chcon.
92 lines
2.2 KiB
Makefile
92 lines
2.2 KiB
Makefile
# Make miscellaneous coreutils tests. -*-Makefile-*-
|
|
|
|
# Copyright (C) 2001-2007 Free Software Foundation, Inc.
|
|
|
|
# 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; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
# 02110-1301, USA.
|
|
|
|
EXTRA_DIST = $(TESTS)
|
|
|
|
TESTS_ENVIRONMENT = \
|
|
top_srcdir=$(top_srcdir) \
|
|
abs_top_builddir=$(abs_top_builddir) \
|
|
srcdir=$(srcdir) \
|
|
PACKAGE_VERSION=$(PACKAGE_VERSION) \
|
|
PERL="$(PERL)" \
|
|
BUILD_SRC_DIR="`pwd`/../../src" \
|
|
CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
|
|
PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
|
|
CONFIG_HEADER=$(CONFIG_HEADER) \
|
|
REPLACE_GETCWD=$(REPLACE_GETCWD) \
|
|
host_os=$(host_os) \
|
|
PROG=`../../src/basename -- "$$tst"`
|
|
|
|
# Do not choose a name that is a shell keyword like 'if', or a
|
|
# commonly-used utility like 'cat' or 'test', as the name of a test.
|
|
# Otherwise, VPATH builds will fail on hosts like Solaris, since they
|
|
# will expand 'if test ...' to 'if .../test ...', and the '.../test'
|
|
# will execute the test script rather than the standard utility.
|
|
|
|
TESTS = \
|
|
pr \
|
|
df-P \
|
|
pwd-unreadable-parent \
|
|
chcon \
|
|
chcon-fail \
|
|
selinux \
|
|
cut \
|
|
wc-files0-from \
|
|
wc-files0 \
|
|
cat-proc \
|
|
base64 \
|
|
basename \
|
|
close-stdout \
|
|
csplit \
|
|
date \
|
|
date-sec \
|
|
df \
|
|
dirname \
|
|
expand \
|
|
false-status \
|
|
fold \
|
|
head-c \
|
|
head-elide-tail \
|
|
head-pos \
|
|
mknod \
|
|
nice \
|
|
nl \
|
|
nohup \
|
|
paste-no-nl \
|
|
pathchk1 \
|
|
printf \
|
|
printf-hex \
|
|
pwd-long \
|
|
sha224sum \
|
|
sha256sum \
|
|
sha384sum \
|
|
sha512sum \
|
|
shuf \
|
|
sort-compress \
|
|
sort-merge \
|
|
sort-rand \
|
|
split-a \
|
|
split-fail \
|
|
split-l \
|
|
stat-fmt \
|
|
stat-printf \
|
|
tac-continue \
|
|
test-diag \
|
|
tty-eof
|