m4: Fix implementation of `struct __sFILE`

Remove unnecessary mitigation.
This commit is contained in:
Tee KOBAYASHI 2022-09-28 19:33:28 +09:00 committed by xtkoba
parent f2be4ef018
commit 65e3f97b5a
3 changed files with 23 additions and 18 deletions

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Traditional Unix macro processor"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.4.19
TERMUX_PKG_REVISION=3
TERMUX_PKG_REVISION=4
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/m4/m4-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96
TERMUX_PKG_BUILD_DEPENDS="libandroid-spawn"

View File

@ -0,0 +1,22 @@
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -68,8 +68,10 @@
# elif defined __ANDROID__ /* Android */
# ifdef __LP64__
# define _gl_flags_file_t int
+# define _gl_struct_file_off_t int64_t
# else
# define _gl_flags_file_t short
+# define _gl_struct_file_off_t __kernel_off_t
# endif
/* Up to this commit from 2015-10-12
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
@@ -96,7 +98,7 @@
unsigned char _nbuf[1]; \
struct { unsigned char *_base; size_t _size; } _lb; \
int _blksize; \
- fpos_t _offset; \
+ _gl_struct_file_off_t _offset; \
/* More fields, not relevant here. */ \
} *) fp)
# else

View File

@ -1,17 +0,0 @@
See https://github.com/termux/termux-packages/issues/9056.
--- a/src/output.c
+++ b/src/output.c
@@ -423,8 +423,12 @@
/* Check if we are exceeding the maximum amount of buffer memory. */
+#if defined __ANDROID__ && !defined __LP64__
+ if (0)
+#else
if (total_buffer_size - output_diversion->size + wanted_size
> MAXIMUM_TOTAL_SIZE)
+#endif
{
int selected_used;
char *selected_buffer;