aboutsummaryrefslogtreecommitdiff
path: root/archival/unzip.c
diff options
context:
space:
mode:
authorHarald van Dijk <harald@gigawatt.nl>2018-05-22 17:34:31 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2018-05-22 17:34:31 +0200
commit8c24af9dcfe0d89a660c39838eec4d20bc13efbf (patch)
tree1be6f930fb21383ba8c46a6d0491cafe3e26d687 /archival/unzip.c
parenta40a661d971cf75c617c83357ac0e87a45f41f4f (diff)
downloadbusybox-w32-8c24af9dcfe0d89a660c39838eec4d20bc13efbf.tar.gz
busybox-w32-8c24af9dcfe0d89a660c39838eec4d20bc13efbf.tar.bz2
busybox-w32-8c24af9dcfe0d89a660c39838eec4d20bc13efbf.zip
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>
Diffstat (limited to 'archival/unzip.c')
-rw-r--r--archival/unzip.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/archival/unzip.c b/archival/unzip.c
index 0d00d8dc9..96b7ab69b 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -372,9 +372,10 @@ static void unzip_extract_symlink(llist_t **symlink_placeholders,
372 target[xstate.mem_output_size] = '\0'; 372 target[xstate.mem_output_size] = '\0';
373#endif 373#endif
374 } 374 }
375 create_or_remember_symlink(symlink_placeholders, 375 create_or_remember_link(symlink_placeholders,
376 target, 376 target,
377 dst_fn); 377 dst_fn,
378 0);
378 free(target); 379 free(target);
379} 380}
380#endif 381#endif
@@ -990,7 +991,7 @@ int unzip_main(int argc, char **argv)
990 } 991 }
991 992
992#if ENABLE_FEATURE_UNZIP_CDF 993#if ENABLE_FEATURE_UNZIP_CDF
993 create_symlinks_from_list(symlink_placeholders); 994 create_links_from_list(symlink_placeholders);
994#endif 995#endif
995 996
996 if ((opts & OPT_l) && quiet <= 1) { 997 if ((opts & OPT_l) && quiet <= 1) {