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.

4 files changed, 25 insertions, 22 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;
diff --git a/src/charset.c b/src/charset.c
index 8e909c5f03c..c532f79d282 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -545,7 +545,7 @@ load_charset_map_from_file (struct charset *charset, Lisp_Object mapfile,
       entries->entry[idx].c = c;
       n_entries++;
     }
-  fclose (fp);
+  emacs_fclose (fp);
   clear_unwind_protect (count);
 
   load_charset_map (charset, head, n_entries, control_flag);
diff --git a/src/image.c b/src/image.c
index 20949703521..821869a42cd 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3248,7 +3248,7 @@ image_set_transform (struct frame *f, struct image *img)
                    * transformed_image->height);
       android_project_image_nearest (image, transformed_image,
                                      &transform);
-      image_unget_x_image (img, false, image);
+      image_unget_x_image (img, true, image);
 
       /* Now replace the image.  */
 
@@ -8024,7 +8024,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
           || png_sig_cmp (sig, 0, sizeof sig))
         {
-          fclose (fp);
+          emacs_fclose (fp);
           image_error ("Not a PNG file: `%s'", file);
           return 0;
         }
@@ -8078,7 +8078,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
     }
   if (! png_ptr)
     {
-      if (fp) fclose (fp);
+      if (fp) emacs_fclose (fp);
       return 0;
     }
 
@@ -8092,7 +8092,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
       xfree (c->pixels);
       xfree (c->rows);
       if (c->fp)
-        fclose (c->fp);
+        emacs_fclose (c->fp);
       return 0;
     }
 
@@ -8217,7 +8217,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
   png_read_end (png_ptr, info_ptr);
   if (fp)
     {
-      fclose (fp);
+      emacs_fclose (fp);
       c->fp = NULL;
     }
 
@@ -8782,7 +8782,7 @@ jpeg_load_body (struct frame *f, struct image *img,
 
       /* Close the input file and destroy the JPEG object.  */
       if (fp)
-        fclose (fp);
+        emacs_fclose (fp);
       jpeg_destroy_decompress (&mgr->cinfo);
 
       /* If we already have an XImage, free that.  */
@@ -8877,7 +8877,7 @@ jpeg_load_body (struct frame *f, struct image *img,
   jpeg_finish_decompress (&mgr->cinfo);
   jpeg_destroy_decompress (&mgr->cinfo);
   if (fp)
-    fclose (fp);
+    emacs_fclose (fp);
 
   /* Maybe fill in the background field while we have ximg handy. */
   if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
@@ -9651,11 +9651,16 @@ gif_load (struct frame *f, struct image *img)
 
           /* Get the file size so that we can report it in
              `image-cache-size'.  */
-          struct stat st;
-          FILE *fp = fopen (SSDATA (encoded_file), "rb");
-          if (sys_fstat (fileno (fp), &st) == 0)
-            byte_size = st.st_size;
-          fclose (fp);
+          {
+            struct stat st;
+            int fd;
+
+            fd = emacs_open (SSDATA (encoded_file), O_RDONLY,
+                             0);
+            if (!sys_fstat (fd, &st))
+              byte_size = st.st_size;
+            emacs_close (fd);
+          }
         }
       else
         {
diff --git a/src/xfaces.c b/src/xfaces.c
index 953e5be3781..af3428ad995 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7004,7 +7004,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string.  */)
                             cmap);
             }
         }
-      fclose (fp);
+      emacs_fclose (fp);
     }
   unblock_input ();
   return cmap;