aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2018-04-09 08:30:13 +0100
committerRon Yorston <rmy@pobox.com>2018-04-09 08:30:13 +0100
commit5b6f06f5eb8628955262508d153627fe6f2d1c8b (patch)
tree25ea1776f833936cf4884a99610778c1578b70f5 /archival
parent13fc352af9a47da92ac0198c7a862c722f143508 (diff)
downloadbusybox-w32-5b6f06f5eb8628955262508d153627fe6f2d1c8b.tar.gz
busybox-w32-5b6f06f5eb8628955262508d153627fe6f2d1c8b.tar.bz2
busybox-w32-5b6f06f5eb8628955262508d153627fe6f2d1c8b.zip
libarchive: failure to extract symlink isn't fatal
Recent upstream changes made the failure of symlink(2) when extracting from an archive a fatal error. The busybox-w32 implementation of symlink(2) always fails. Just issue a warning and move on.
Diffstat (limited to 'archival')
-rw-r--r--archival/libarchive/unsafe_symlink_target.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c
index 8dcafeaa1..0ad4c9392 100644
--- a/archival/libarchive/unsafe_symlink_target.c
+++ b/archival/libarchive/unsafe_symlink_target.c
@@ -5,10 +5,12 @@
5#include "libbb.h" 5#include "libbb.h"
6#include "bb_archive.h" 6#include "bb_archive.h"
7 7
8void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders, 8void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders
9 IF_PLATFORM_MINGW32(UNUSED_PARAM),
9 const char *target, 10 const char *target,
10 const char *linkname) 11 const char *linkname)
11{ 12{
13#if !ENABLE_PLATFORM_MINGW32
12 if (target[0] == '/' || strstr(target, "..")) { 14 if (target[0] == '/' || strstr(target, "..")) {
13 llist_add_to(symlink_placeholders, 15 llist_add_to(symlink_placeholders,
14 xasprintf("%s%c%s", linkname, '\0', target) 16 xasprintf("%s%c%s", linkname, '\0', target)
@@ -21,8 +23,13 @@ void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders,
21 "sym", linkname, target 23 "sym", linkname, target
22 ); 24 );
23 } 25 }
26#else
27 /* symlink isn't implemented for WIN32, just issue a warning */
28 bb_perror_msg("can't create %slink '%s' to '%s'", "sym", linkname, target);
29#endif
24} 30}
25 31
32#if !ENABLE_PLATFORM_MINGW32
26void FAST_FUNC create_symlinks_from_list(llist_t *list) 33void FAST_FUNC create_symlinks_from_list(llist_t *list)
27{ 34{
28 while (list) { 35 while (list) {
@@ -39,3 +46,4 @@ void FAST_FUNC create_symlinks_from_list(llist_t *list)
39 list = list->link; 46 list = list->link;
40 } 47 }
41} 48}
49#endif