diff options
author | Ron Yorston <rmy@pobox.com> | 2018-07-25 10:41:42 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-07-25 10:41:42 +0100 |
commit | 59873514f17cefd6ba3997dad5779f75433fd4e6 (patch) | |
tree | 1c9d0a3450ed95f0b820285b9f9fc217c902e652 /archival/unzip.c | |
parent | 779fd5745ac11bf752f5f4b977a274a39c192f90 (diff) | |
parent | 81de30de05beebabfa72f2a01ec4f33e9a1923e3 (diff) | |
download | busybox-w32-59873514f17cefd6ba3997dad5779f75433fd4e6.tar.gz busybox-w32-59873514f17cefd6ba3997dad5779f75433fd4e6.tar.bz2 busybox-w32-59873514f17cefd6ba3997dad5779f75433fd4e6.zip |
Merge branch 'busybox'
Diffstat (limited to 'archival/unzip.c')
-rw-r--r-- | archival/unzip.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/archival/unzip.c b/archival/unzip.c index 369c6c028..a9b7dc10f 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
@@ -375,9 +375,10 @@ static void unzip_extract_symlink(llist_t **symlink_placeholders, | |||
375 | target[xstate.mem_output_size] = '\0'; | 375 | target[xstate.mem_output_size] = '\0'; |
376 | #endif | 376 | #endif |
377 | } | 377 | } |
378 | create_or_remember_symlink(symlink_placeholders, | 378 | create_or_remember_link(symlink_placeholders, |
379 | target, | 379 | target, |
380 | dst_fn); | 380 | dst_fn, |
381 | 0); | ||
381 | free(target); | 382 | free(target); |
382 | } | 383 | } |
383 | #endif | 384 | #endif |
@@ -993,7 +994,7 @@ int unzip_main(int argc, char **argv) | |||
993 | } | 994 | } |
994 | 995 | ||
995 | #if ENABLE_FEATURE_UNZIP_CDF | 996 | #if ENABLE_FEATURE_UNZIP_CDF |
996 | create_symlinks_from_list(symlink_placeholders); | 997 | create_links_from_list(symlink_placeholders); |
997 | #endif | 998 | #endif |
998 | 999 | ||
999 | if ((opts & OPT_l) && quiet <= 1) { | 1000 | if ((opts & OPT_l) && quiet <= 1) { |