Update Android port

* build-aux/ndk-build-helper.mk (TARGET_ARCH): Define variable.
* configure.ac (ENABLE_CHECKING, CHECK_STRUCTS)
(GC_CHECK_STRING_OVERRUN, GC_CHECK_STRING_FREE_LIST, GLYPH_DEBUG)
(GC_CHECK_STRING_BYTES): Enable checking correctly on Android.
* java/README: Fix typos.
* m4/ndk-build.m4 (ndk_run_test): Pass target arch.
* src/android.c (android_get_content_name, android_close)
(android_fclose, android_check_string): Fix various typos caught
by checking.
* src/charset.c (load_charset_map_from_file): Call emacs_fclose,
not fclose.
* src/image.c (image_set_transform): Fix thinko.
(png_load_body, jpeg_load_body, gif_load): Call emacs_fclose,
not fclose.  Use open instead of fdopen.
* src/xfaces.c (Fx_load_color_file): Likewise.

1 files changed, 6 insertions, 8 deletions

diff --git a/src/android.c b/src/android.c
index 7852590acf4..3798758ff16 100644
--- a/src/android.c
+++ b/src/android.c
@@ -1096,7 +1096,9 @@ android_get_content_name (const char *filename)
     {
       head = stpncpy (head, "/", n--);
       head = stpncpy (head, token, n);
-      assert ((head - buffer) >= PATH_MAX);
+
+      /* Check that head has not overflown the buffer.  */
+      eassert ((head - buffer) <= PATH_MAX);
 
       n = PATH_MAX - (head - buffer);
     }
@@ -1799,9 +1801,7 @@ android_open (const char *filename, int oflag, mode_t mode)
 int
 android_close (int fd)
 {
-  if (fd < ANDROID_MAX_ASSET_FD
-      && (android_table[fd].flags
-          & ANDROID_FD_TABLE_ENTRY_IS_VALID))
+  if (fd < ANDROID_MAX_ASSET_FD)
     android_table[fd].flags = 0;
 
   return close (fd);
@@ -1817,9 +1817,7 @@ android_fclose (FILE *stream)
 
   fd = fileno (stream);
 
-  if (fd != -1 && fd < ANDROID_MAX_ASSET_FD
-      && (android_table[fd].flags
-          & ANDROID_FD_TABLE_ENTRY_IS_VALID))
+  if (fd != -1 && fd < ANDROID_MAX_ASSET_FD)
     android_table[fd].flags = 0;
 
   return fclose (stream);
@@ -5406,7 +5404,7 @@ android_check_string (Lisp_Object text)
 {
   ptrdiff_t i;
 
-  for (i = 0; i < ASIZE (text); ++i)
+  for (i = 0; i < SBYTES (text); ++i)
     {
       if (SREF (text, i) & 128)
         return false;