2 files changed, 13 insertions, 8 deletions

diff --git a/include/bb_archive.h b/include/bb_archive.h
index 2182fcc3c..ace9c8e23 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -74,8 +74,8 @@ typedef struct archive_handle_t {
         /* Currently processed file's header */
         file_header_t *file_header;
 
-        /* List of symlink placeholders */
-        llist_t *symlink_placeholders;
+        /* List of link placeholders */
+        llist_t *link_placeholders;
 
         /* Process the header component, e.g. tar -t */
         void FAST_FUNC (*action_header)(const file_header_t *);
@@ -126,10 +126,10 @@ typedef struct archive_handle_t {
 #if ENABLE_FEATURE_AR_CREATE
         const char *ar__name;
         struct archive_handle_t *ar__out;
-# if ENABLE_FEATURE_AR_LONG_FILENAMES
+#endif
+#if ENABLE_FEATURE_AR_LONG_FILENAMES
         char *ar__long_names;
         unsigned ar__long_name_size;
-# endif
 #endif
 } archive_handle_t;
 /* bits in ah_flags */
@@ -213,13 +213,14 @@ void seek_by_jump(int fd, off_t amount) FAST_FUNC;
 void seek_by_read(int fd, off_t amount) FAST_FUNC;
 
 const char *strip_unsafe_prefix(const char *str) FAST_FUNC;
-void create_or_remember_symlink(llist_t **symlink_placeholders,
+void create_or_remember_link(llist_t **link_placeholders,
                 const char *target,
-                const char *linkname) FAST_FUNC;
+                const char *linkname,
+                int hard_link) FAST_FUNC;
 #if !ENABLE_PLATFORM_MINGW32
-void create_symlinks_from_list(llist_t *list) FAST_FUNC;
+void create_links_from_list(llist_t *list) FAST_FUNC;
 #else
-#define create_symlinks_from_list(l) (void)0
+#define create_links_from_list(l) (void)0
 #endif
 
 void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC;
diff --git a/include/libbb.h b/include/libbb.h
index fb9167ce3..0264282dd 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -428,6 +428,9 @@ enum {	/* cp.c, mv.c, install.c depend on these values. CAREFUL when changing th
         FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 15, /* -c */
 #endif
         FILEUTILS_RMDEST          = 1 << (16 - !ENABLE_SELINUX), /* --remove-destination */
+        /* bit 17 skipped for "cp --parents" */
+        FILEUTILS_REFLINK         = 1 << (18 - !ENABLE_SELINUX), /* cp --reflink=auto */
+        FILEUTILS_REFLINK_ALWAYS  = 1 << (19 - !ENABLE_SELINUX), /* cp --reflink[=always] */
         /*
          * Hole. cp may have some bits set here,
          * they should not affect remove_file()/copy_file()
@@ -503,6 +506,7 @@ DIR *xopendir(const char *path) FAST_FUNC;
 DIR *warn_opendir(const char *path) FAST_FUNC;
 
 char *xmalloc_realpath(const char *path) FAST_FUNC RETURNS_MALLOC;
+char *xmalloc_realpath_coreutils(const char *path) FAST_FUNC RETURNS_MALLOC;
 char *xmalloc_readlink(const char *path) FAST_FUNC RETURNS_MALLOC;
 char *xmalloc_readlink_or_warn(const char *path) FAST_FUNC RETURNS_MALLOC;
 /* !RETURNS_MALLOC: it's a realloc-like function */