Locale fix and upgrade

* #2
* libarchive 3.5.2
* lzma 5.2.5

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 green-green-avk
+Copyright (c) 2021 green-green-avk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

android-min.h

@@ -131,6 +131,7 @@
 #define HAVE_SIGACTION 1
 #define HAVE_SIGNAL_H 1
 #define HAVE_STATFS 1
+#define HAVE_STRUCT_STATFS 1
 #define HAVE_STDARG_H 1
 #define HAVE_STDINT_H 1
 #define HAVE_STDLIB_H 1

android.patch

@@ -1,3 +1,36 @@
+--- libarchive/archive_string.c
++++ libarchive/archive_string.c
+@@ -59,6 +59,8 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_string.c 201095 2009-12-28 02:33
+ #endif
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ #include <windows.h>
++#endif
++#if defined(_WIN32) && !defined(__CYGWIN__) || defined(HAVE_LOCALE_H)
+ #include <locale.h>
+ #endif
+
+@@ -429,9 +431,21 @@ default_iconv_charset(const char *charset) {
+ 	return locale_charset();
+ #elif HAVE_NL_LANGINFO
+ 	return nl_langinfo(CODESET);
++#else
++	// No iconv, etc... :(
++#if defined(HAVE_SETLOCALE)
++	// It is required just to understand what can we actually convert...
++	const char *const locale = setlocale(LC_CTYPE, NULL);
++	const char *const dot = strchr(locale, '.');
++	if (dot != NULL)
++		return dot + 1;
++#endif
++#if defined(__ANDROID__)
++	return "UTF-8"; // It looks a bit more sane here...
+ #else
+ 	return "";
+ #endif
++#endif
+ }
+
+ #if defined(_WIN32) && !defined(__CYGWIN__)
 --- libarchive/archive_write_disk_posix.c
 +++ libarchive/archive_write_disk_posix.c
 @@ -2206,8 +2206,8 @@ restore_entry(struct archive_write_disk *a)
@@ -27,12 +60,17 @@
  		}
  		/*
  		 * TODO: consider using the cleaned-up path as the link
-@@ -2284,7 +2284,34 @@ create_filesystem_object(struct archive_write_disk *a)
+@@ -2284,12 +2284,39 @@ create_filesystem_object(struct archive_write_disk *a)
  		 */
  		if (a->flags & ARCHIVE_EXTRACT_SAFE_WRITES)
  			unlink(a->name);
 +#ifndef IS_ANDROID_NOROOT
+ #ifdef HAVE_LINKAT
+ 		r = linkat(AT_FDCWD, linkname, AT_FDCWD, a->name,
+ 		    0) ? errno : 0;
+ #else
  		r = link(linkname, a->name) ? errno : 0;
+ #endif
 +		if (r != 0)
 +			archive_set_error(&a->archive, ARCHIVE_FAILED, "Can't create hard link '%s', errno = %d",
 +				a->name, r);
@@ -62,7 +100,7 @@
  		/*
  		 * New cpio and pax formats allow hardlink entries
  		 * to carry data, so we may have to open the file
-@@ -2329,7 +2356,11 @@ create_filesystem_object(struct archive_write_disk *a)
+@@ -2334,7 +2361,11 @@ create_filesystem_object(struct archive_write_disk *a)
  		 */
  		if (a->flags & ARCHIVE_EXTRACT_SAFE_WRITES)
  			unlink(a->name);

build.sh

@@ -5,7 +5,7 @@ set -e
 [ "$1" = '-u' ] && UPDATE=1
 
 BUILD_DIR='build'
-VER='3.5.1'
+VER='3.5.2'
 NAME="libarchive-$VER"
 
 export PATH="$HOME/Android/Sdk/ndk/21.3.6528147:$PATH"

lzma/build.sh

@@ -3,7 +3,7 @@
 set -e
 
 BUILD_DIR='build'
-VER='5.2.4'
+VER='5.2.5'
 NAME="xz-$VER"
 
 mkdir -p "$BUILD_DIR"

minitar/minitar.c

@@ -52,6 +52,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <locale.h>
 
 /*
  * NO_CREATE implies NO_XZ_CREATE and implies NO_BZIP2_CREATE and NO_GZIP_CREATE and NO_COMPRESS_CREATE.
@@ -153,6 +154,8 @@ static int verbose = 0;
 int
 main(int argc, const char **argv)
 {
+	setlocale(LC_ALL, "");
+
 	const char *filename = NULL;
 	int compress, flags, mode, opt;