CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 18:56:39 +02:00
Code Issues Projects Releases Wiki Activity

cp: -p --parents: fix failure to preserve permissions for absolute paths

Browse Source 
* src/cp.c (re_protect): Ensure copy_acl() is passed an absolute path.
* tests/cp/cp-parents.sh: Add a test case.
* NEWS: Mention the bug.
Fixes https://bugs.gnu.org/63245
This commit is contained in:
Pádraig Brady
2023-05-03 17:01:37 +01:00
parent 7223651ad1
commit c6b1fe4347
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -4,6 +4,10 @@ GNU coreutils NEWS -*- outline -*-
** Bug fixes
cp --parents again succeeds to preserve mode for absolute directories.
Previously it would have failed with a "No such file or directory" error.
[bug introduced in coreutils-9.1]
cksum again diagnoses read errors in its default CRC32 mode.
[bug introduced in coreutils-9.0]

16
src/cp.c
View File

@@ -296,15 +296,19 @@ regular file.\n\
when done. */
static bool
re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_relname,
re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_fullname,
struct dir_attr *attr_list, const struct cp_options *x)
{
struct dir_attr *p;
char *dst_name; /* A copy of CONST_DST_NAME we can change. */
char *src_name; /* The source name in 'dst_name'. */
char *src_name; /* The relative source name in 'dst_name'. */
char *full_src_name; /* The full source name in 'dst_name'. */
ASSIGN_STRDUPA (dst_name, const_dst_name);
src_name = dst_name + (dst_relname - const_dst_name);
full_src_name = dst_name + (dst_fullname - const_dst_name);
src_name = full_src_name;
while (*src_name == '/')
src_name++;
for (p = attr_list; p; p = p->next)
{
@@ -347,7 +351,7 @@ re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_relname,
if (x->preserve_mode)
{
if (copy_acl (src_name, -1, dst_name, -1, p->st.st_mode) != 0)
if (copy_acl (full_src_name, -1, dst_name, -1, p->st.st_mode) != 0)
return false;
}
else if (p->restore_mode)
@@ -687,6 +691,7 @@ do_copy (int n_files, char **file, char const *target_directory,
bool parent_exists = true; /* True if dir_name (dst_name) exists. */
struct dir_attr *attr_list;
char *arg_in_concat = NULL;
char *full_arg_in_concat = NULL;
char *arg = file[i];
/* Trailing slashes are meaningful (i.e., maybe worth preserving)
@@ -719,6 +724,7 @@ do_copy (int n_files, char **file, char const *target_directory,
(x->verbose ? "%s -> %s\n" : NULL),
&attr_list, &new_dst, x));
full_arg_in_concat = arg_in_concat;
while (*arg_in_concat == '/')
arg_in_concat++;
}
@@ -747,7 +753,7 @@ do_copy (int n_files, char **file, char const *target_directory,
new_dst, x, &copy_into_self, NULL);
if (parents_option)
ok &= re_protect (dst_name, target_dirfd, arg_in_concat,
ok &= re_protect (dst_name, target_dirfd, full_arg_in_concat,
attr_list, x);
}

6
tests/cp/cp-parents.sh
View File

@@ -66,4 +66,10 @@ p=$(ls -ld g/sym/b/c|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac
cp --parents --no-preserve=mode np/b/file np_dest/ || fail=1
p=$(ls -ld np_dest/np|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac
# coreutils 9.1-9.3 inclusive would fail to copy acls for absolute dirs
mkdir dest || framework_failure_
if test -f /bin/ls; then
cp -t dest --parents -p /bin/ls || fail=1
fi
Exit $fail