tar: fix interaction of delayed symlink and hardlink creation

function                                             old     new   delta
create_or_remember_link                                -     106    +106
create_links_from_list                                 -      93     +93
find_applet_by_name                                  124     128      +4
unzip_main                                          2724    2726      +2
data_extract_all                                     891     873     -18
create_symlinks_from_list                             64       -     -64
create_or_remember_symlink                            94       -     -94
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 2/1 up/down: 205/-176)           Total: 29 bytes

Signed-off-by: Harald van Dijk <harald@gigawatt.nl>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/include/bb_archive.h b/include/bb_archive.h
index 0252488bf..2ee30f794 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -64,8 +64,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 *);
@@ -203,10 +203,11 @@ 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;
-void create_symlinks_from_list(llist_t *list) FAST_FUNC;
+                const char *linkname,
+                int hard_link) FAST_FUNC;
+void create_links_from_list(llist_t *list) FAST_FUNC;
 
 void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC;
 const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC;