mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
cp: don't mishandle existing dir dest permissions (Bug#9170)
* src/copy.c (copy_internal): If we don't create the directory, then we cannot have omitted permissions. Problem and trivial fix reported by Eric Lammerts. * tests/Makefile.am (TESTS): Add cp/existing-perm-dir. * tests/cp/existing-perm-dir: New file.
This commit is contained in:
1 parent
f28a09810b
commit
e772bddde8
3 files changed
+34
No files matched your search
@@ -2211,6 +2211,8 @@ copy_internal (char const *src_name, char const *dst_name,
|
||||
if (x->verbose)
|
||||
emit_verbose (src_name, dst_name, NULL);
|
||||
}
|
||||
else
|
||||
omitted_permissions = 0;
|
||||
|
||||
/* Decide whether to copy the contents of the directory. */
|
||||
if (x->one_file_system && device != 0 && device != src_sb.st_dev)
|
||||
|
||||
@@ -323,6 +323,7 @@ TESTS = \
|
||||
cp/dir-rm-dest \
|
||||
cp/dir-slash \
|
||||
cp/dir-vs-file \
|
||||
cp/existing-perm-dir \
|
||||
cp/existing-perm-race \
|
||||
cp/fail-perm \
|
||||
cp/fiemap-empty \
|
||||
|
||||
Executable
+31
@@ -0,0 +1,31 @@
|
||||
#!/bin/sh
|
||||
# Make sure cp -p doesn't "restore" permissions it shouldn't (Bug#9170).
|
||||
|
||||
# Copyright 2011 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 3 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, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
. "${srcdir=.}/init.sh"; path_prepend_ ../src
|
||||
print_ver_ cp
|
||||
|
||||
umask 002
|
||||
mkdir -p -m ug-s,u=rwx,g=rwx,o=rx src/dir || fail=1
|
||||
mkdir -p -m ug-s,u=rwx,g=,o= dst/dir || fail=1
|
||||
|
||||
cp -r src/. dst/ || fail=1
|
||||
|
||||
mode=`ls -ld dst/dir | cut -b-10`
|
||||
test "$mode" = drwx------ || fail=1
|
||||
|
||||
Exit $fail
|
||||
Reference in new issue
Block a user