X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fbasic%2Fcopy.h;h=d46f1c92a731d385a2f1c6158fc4e01e6baf30d9;hb=HEAD;hp=2cc7ad1465fa19c38430c87d9e4af08ad3ec68f4;hpb=2705eaf36d46539397571886ba6ccd0045ef3e9b;p=elogind.git

diff --git a/src/basic/copy.h b/src/basic/copy.h
index 2cc7ad146..d46f1c92a 100644
--- a/src/basic/copy.h
+++ b/src/basic/copy.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -23,20 +21,26 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/types.h>
 
-/// UNNEEDED by elogind
-#if 0
-int copy_file_fd(const char *from, int to, bool try_reflink);
-int copy_file(const char *from, const char *to, int flags, mode_t mode, unsigned chattr_flags);
-int copy_file_atomic(const char *from, const char *to, mode_t mode, bool replace, unsigned chattr_flags);
-int copy_tree(const char *from, const char *to, bool merge);
-int copy_tree_at(int fdf, const char *from, int fdt, const char *to, bool merge);
-int copy_directory_fd(int dirfd, const char *to, bool merge);
+typedef enum CopyFlags {
+        COPY_REFLINK    = 0x1,      /* try to reflink */
+        COPY_MERGE      = 0x2,      /* merge existing trees with our new one to copy */
+        COPY_REPLACE    = 0x4,      /* replace an existing file if there's one */
+} CopyFlags;
+
+#if 0 /// UNNEEDED by elogind
+int copy_file_fd(const char *from, int to, CopyFlags copy_flags);
+int copy_file(const char *from, const char *to, int open_flags, mode_t mode, unsigned chattr_flags, CopyFlags copy_flags);
+int copy_file_atomic(const char *from, const char *to, mode_t mode, unsigned chattr_flags, CopyFlags copy_flags);
+int copy_tree(const char *from, const char *to, uid_t override_uid, gid_t override_gid, CopyFlags copy_flags);
+int copy_tree_at(int fdf, const char *from, int fdt, const char *to, uid_t override_uid, gid_t override_gid, CopyFlags copy_flags);
+int copy_directory_fd(int dirfd, const char *to, CopyFlags copy_flags);
+int copy_directory(const char *from, const char *to, CopyFlags copy_flags);
 #endif // 0
-int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink);
-/// UNNEEDED by elogind
-#if 0
+int copy_bytes(int fdf, int fdt, uint64_t max_bytes, CopyFlags copy_flags);
+#if 0 /// UNNEEDED by elogind
 int copy_times(int fdf, int fdt);
 int copy_xattr(int fdf, int fdt);
 #endif // 0