From 8c24af9dcfe0d89a660c39838eec4d20bc13efbf Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Tue, 22 May 2018 17:34:31 +0200 Subject: 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 Signed-off-by: Denys Vlasenko --- archival/libarchive/unsafe_symlink_target.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'archival/libarchive/unsafe_symlink_target.c') diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c index 8dcafea..f8dc803 100644 --- a/archival/libarchive/unsafe_symlink_target.c +++ b/archival/libarchive/unsafe_symlink_target.c @@ -5,13 +5,14 @@ #include "libbb.h" #include "bb_archive.h" -void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders, +void FAST_FUNC create_or_remember_link(llist_t **link_placeholders, const char *target, - const char *linkname) + const char *linkname, + int hard_link) { - if (target[0] == '/' || strstr(target, "..")) { - llist_add_to(symlink_placeholders, - xasprintf("%s%c%s", linkname, '\0', target) + if (hard_link || target[0] == '/' || strstr(target, "..")) { + llist_add_to_end(link_placeholders, + xasprintf("%c%s%c%s", hard_link, linkname, '\0', target) ); return; } @@ -23,17 +24,17 @@ void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders, } } -void FAST_FUNC create_symlinks_from_list(llist_t *list) +void FAST_FUNC create_links_from_list(llist_t *list) { while (list) { char *target; - target = list->data + strlen(list->data) + 1; - if (symlink(target, list->data)) { + target = list->data + 1 + strlen(list->data + 1) + 1; + if ((*list->data ? link : symlink) (target, list->data + 1)) { /* shared message */ bb_error_msg_and_die("can't create %slink '%s' to '%s'", - "sym", - list->data, target + *list->data ? "hard" : "sym", + list->data + 1, target ); } list = list->link; -- cgit v1.1