SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

copy: use stat_verify_directory() where appropriate

Browse Source
This commit is contained in:
Lennart Poettering
2021-02-06 10:37:10 +00:00
committed by Luca Boccassi
parent afe6a9c48e
commit 900915080a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/copy.c
+8 -4
View File
@@ -973,6 +973,7 @@ int copy_directory_fd_full(
void *userdata) {
struct stat st;
int r;
assert(dirfd >= 0);
assert(to);
@@ -980,8 +981,9 @@ int copy_directory_fd_full(
if (fstat(dirfd, &st) < 0)
return -errno;
if (!S_ISDIR(st.st_mode))
return -ENOTDIR;
r = stat_verify_directory(&st);
if (r < 0)
return r;
return fd_copy_directory(dirfd, NULL, &st, AT_FDCWD, to, st.st_dev, COPY_DEPTH_MAX, UID_INVALID, GID_INVALID, copy_flags, NULL, NULL, progress_path, progress_bytes, userdata);
}
@@ -995,6 +997,7 @@ int copy_directory_full(
void *userdata) {
struct stat st;
int r;
assert(from);
assert(to);
@@ -1002,8 +1005,9 @@ int copy_directory_full(
if (lstat(from, &st) < 0)
return -errno;
if (!S_ISDIR(st.st_mode))
return -ENOTDIR;
r = stat_verify_directory(&st);
if (r < 0)
return r;
return fd_copy_directory(AT_FDCWD, from, &st, AT_FDCWD, to, st.st_dev, COPY_DEPTH_MAX, UID_INVALID, GID_INVALID, copy_flags, NULL, NULL, progress_path, progress_bytes, userdata);
}