1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00

Merge pull request #692 from poettering/fd-copy-directory-all

copy: when we recursively copy a directory tree, copy everything
This commit is contained in:
Daniel Mack 2015-07-23 23:20:18 +02:00
commit 6fa7ec3b6b

View File

@ -24,6 +24,7 @@
#include "util.h"
#include "btrfs-util.h"
#include "strv.h"
#include "copy.h"
#define COPY_BUFFER_SIZE (16*1024)
@ -262,10 +263,13 @@ static int fd_copy_directory(
(void) copy_xattr(dirfd(d), fdt);
}
FOREACH_DIRENT(de, d, return -errno) {
FOREACH_DIRENT_ALL(de, d, return -errno) {
struct stat buf;
int q;
if (STR_IN_SET(de->d_name, ".", ".."))
continue;
if (fstatat(dirfd(d), de->d_name, &buf, AT_SYMLINK_NOFOLLOW) < 0) {
r = -errno;
continue;