Fredrik Fornwall
9 years ago
4 changed files with 44 additions and 16 deletions
@ -0,0 +1,15 @@ |
|||||
|
diff -u -r ../libarchive-3.2.0/libarchive/archive.h ./libarchive/archive.h
|
||||
|
--- ../libarchive-3.2.0/libarchive/archive.h 2016-04-30 00:44:07.000000000 -0400
|
||||
|
+++ ./libarchive/archive.h 2016-05-02 19:58:33.742590137 -0400
|
||||
|
@@ -96,11 +96,6 @@
|
||||
|
# endif |
||||
|
#endif |
||||
|
|
||||
|
-/* Large file support for Android */
|
||||
|
-#ifdef __ANDROID__
|
||||
|
-#include "android_lf.h"
|
||||
|
-#endif
|
||||
|
-
|
||||
|
/* |
||||
|
* On Windows, define LIBARCHIVE_STATIC if you're building or using a |
||||
|
* .lib. The default here assumes you're building a DLL. Only |
@ -0,0 +1,15 @@ |
|||||
|
diff -u -r ../libarchive-3.2.0/libarchive/archive_entry.h ./libarchive/archive_entry.h
|
||||
|
--- ../libarchive-3.2.0/libarchive/archive_entry.h 2016-04-30 00:44:07.000000000 -0400
|
||||
|
+++ ./libarchive/archive_entry.h 2016-05-02 19:58:22.878678982 -0400
|
||||
|
@@ -75,11 +75,6 @@
|
||||
|
# define __LA_MODE_T mode_t |
||||
|
#endif |
||||
|
|
||||
|
-/* Large file support for Android */
|
||||
|
-#ifdef __ANDROID__
|
||||
|
-#include "android_lf.h"
|
||||
|
-#endif
|
||||
|
-
|
||||
|
/* |
||||
|
* On Windows, define LIBARCHIVE_STATIC if you're building or using a |
||||
|
* .lib. The default here assumes you're building a DLL. Only |
@ -1,15 +1,15 @@ |
|||||
diff -u -r ../libarchive-3.1.2/libarchive/archive_write_set_format_zip.c ./libarchive/archive_write_set_format_zip.c
|
diff -u -r ../libarchive-3.2.0/libarchive/archive_write_set_format_zip.c ./libarchive/archive_write_set_format_zip.c
|
||||
--- ../libarchive-3.1.2/libarchive/archive_write_set_format_zip.c 2013-01-14 02:43:45.000000000 +0100
|
--- ../libarchive-3.2.0/libarchive/archive_write_set_format_zip.c 2016-01-01 17:18:57.000000000 -0500
|
||||
+++ ./libarchive/archive_write_set_format_zip.c 2014-07-15 19:11:00.070843621 +0200
|
+++ ./libarchive/archive_write_set_format_zip.c 2016-05-02 20:09:52.331542213 -0400
|
||||
@@ -413,7 +413,10 @@
|
@@ -651,10 +651,8 @@
|
||||
if (strcmp(archive_string_conversion_charset_name( |
if (strcmp(archive_string_conversion_charset_name( |
||||
zip->opt_sconv), "UTF-8") == 0) |
zip->opt_sconv), "UTF-8") == 0) |
||||
zip->flags |= ZIP_FLAGS_UTF8_NAME; |
zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME; |
||||
-#if HAVE_NL_LANGINFO
|
-#if HAVE_NL_LANGINFO
|
||||
+#ifdef __ANDROID__
|
- } else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
|
||||
+ } else if (1) {
|
+ } else {
|
||||
+ zip->flags |= ZIP_FLAGS_UTF8_NAME;
|
zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME; |
||||
+#elif HAVE_NL_LANGINFO
|
-#endif
|
||||
} else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) { |
} |
||||
zip->flags |= ZIP_FLAGS_UTF8_NAME; |
} |
||||
#endif |
filename_length = path_length(zip->entry); |
||||
|
Loading…
Reference in new issue