summaryrefslogtreecommitdiff
path: root/src/shared/copy.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-19 19:36:08 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-19 19:36:08 +0200
commite156347e0480d3eee4877463297149ae96e34f8c (patch)
treeb0ee5eafac6c1e2ffbcd0e7cfa1a5c3c9b6911e9 /src/shared/copy.h
parent19f3934057d20c63f4c95791312038a41b4666d0 (diff)
tmpfiles: make sure "C" doesn't copy anything if the destination already exists
Previously it would recursively copy the entire tree in, and descend into subdirectories even if the destination already exists. Let's do what the documentation says and not do that. If files down the tree shall be copied too, they should get their own "C" lines.
Diffstat (limited to 'src/shared/copy.h')
-rw-r--r--src/shared/copy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/copy.h b/src/shared/copy.h
index 8fb057fe86..1d5e0adc53 100644
--- a/src/shared/copy.h
+++ b/src/shared/copy.h
@@ -22,5 +22,5 @@
***/
int copy_file(const char *from, const char *to, int flags, mode_t mode);
-int copy_tree(const char *from, const char *to);
+int copy_tree(const char *from, const char *to, bool merge);
int copy_bytes(int fdf, int fdt);