Update Android port

* java/org/gnu/emacs/EmacsNative.java: Declare ftruncate.

* java/org/gnu/emacs/EmacsSafThread.java (openDocument1): If
initially opening with rwt, verify the file descriptor is really
writable; if not, resort to rw and truncating the file descriptor
by hand instead.

* src/androidvfs.c (NATIVE_NAME (ftruncate)): New function.
Truncate file descriptor and return whether that was successful.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/androidvfs.c b/src/androidvfs.c
index dc5097f463e..d6daff481b0 100644
--- a/src/androidvfs.c
+++ b/src/androidvfs.c
@@ -5605,7 +5605,7 @@ android_saf_file_open (struct android_vnode *vnode, int flags,
   /* Open a parcel file descriptor according to flags.  */
 
   method = service_class.open_document;
-  trunc  = flags & O_TRUNC;
+  trunc  = (flags & O_TRUNC);
   write  = ((flags & O_RDWR) == O_RDWR || (flags & O_WRONLY));
   inside_saf_critical_section = true;
   descriptor
@@ -6121,6 +6121,12 @@ NATIVE_NAME (safPostRequest) (JNIEnv *env, jobject object)
   sem_post (&saf_completion_sem);
 }
 
+JNIEXPORT jboolean JNICALL
+NATIVE_NAME (ftruncate) (JNIEnv *env, jobject object, jint fd)
+{
+  return ftruncate (fd, 0) != -1;
+}
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #else /* GNUC */