From 6312c005522de47dcaf442f613065415bcbd8ef7 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Thu, 14 Feb 2019 11:25:52 +0000 Subject: libarchive: remove more symlink code Since symlinks aren't supported in busybox-w32 remove more of the code that handles them. Saves 64 bytes. --- archival/libarchive/unsafe_symlink_target.c | 5 ++--- archival/unzip.c | 5 ++++- include/bb_archive.h | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c index f53881f2f..ff96991f5 100644 --- a/archival/libarchive/unsafe_symlink_target.c +++ b/archival/libarchive/unsafe_symlink_target.c @@ -5,11 +5,10 @@ #include "libbb.h" #include "bb_archive.h" -void FAST_FUNC create_or_remember_link(llist_t **link_placeholders - IF_PLATFORM_MINGW32(UNUSED_PARAM), +void FAST_FUNC create_or_remember_link(llist_t **link_placeholders, const char *target, const char *linkname, - int hard_link IF_PLATFORM_MINGW32(UNUSED_PARAM)) + int hard_link) { #if !ENABLE_PLATFORM_MINGW32 if (hard_link || target[0] == '/' || strstr(target, "..")) { diff --git a/archival/unzip.c b/archival/unzip.c index 6328f4bab..4e8ed0eae 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -348,6 +348,9 @@ static void unzip_create_leading_dirs(const char *fn) } #if ENABLE_FEATURE_UNZIP_CDF +#if ENABLE_PLATFORM_MINGW32 +#define unzip_extract_symlink(s, z, d) unzip_extract_symlink(z, d) +#endif static void unzip_extract_symlink(llist_t **symlink_placeholders, zip_header_t *zip, const char *dst_fn) @@ -492,7 +495,7 @@ int unzip_main(int argc, char **argv) llist_t *zaccept = NULL; llist_t *zreject = NULL; char *base_dir = NULL; -#if ENABLE_FEATURE_UNZIP_CDF +#if ENABLE_FEATURE_UNZIP_CDF && !ENABLE_PLATFORM_MINGW32 llist_t *symlink_placeholders = NULL; #endif int i; diff --git a/include/bb_archive.h b/include/bb_archive.h index 7d70ac086..b2cb7b347 100644 --- a/include/bb_archive.h +++ b/include/bb_archive.h @@ -213,6 +213,9 @@ 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; +#if ENABLE_PLATFORM_MINGW32 +#define create_or_remember_link(lp, t, ln, hl) create_or_remember_link(t, ln) +#endif void create_or_remember_link(llist_t **link_placeholders, const char *target, const char *linkname, -- cgit v1.2.3-55-g6feb